diff options
Diffstat (limited to 'drivers/ssb/driver_gige.c')
-rw-r--r-- | drivers/ssb/driver_gige.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/ssb/driver_gige.c b/drivers/ssb/driver_gige.c index f30ea689933a..21f71a1581fa 100644 --- a/drivers/ssb/driver_gige.c +++ b/drivers/ssb/driver_gige.c | |||
@@ -107,9 +107,8 @@ void gige_pcicfg_write32(struct ssb_gige *dev, | |||
107 | gige_write32(dev, SSB_GIGE_PCICFG + offset, value); | 107 | gige_write32(dev, SSB_GIGE_PCICFG + offset, value); |
108 | } | 108 | } |
109 | 109 | ||
110 | static int __devinit ssb_gige_pci_read_config(struct pci_bus *bus, | 110 | static int ssb_gige_pci_read_config(struct pci_bus *bus, unsigned int devfn, |
111 | unsigned int devfn, int reg, | 111 | int reg, int size, u32 *val) |
112 | int size, u32 *val) | ||
113 | { | 112 | { |
114 | struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops); | 113 | struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops); |
115 | unsigned long flags; | 114 | unsigned long flags; |
@@ -138,9 +137,8 @@ static int __devinit ssb_gige_pci_read_config(struct pci_bus *bus, | |||
138 | return PCIBIOS_SUCCESSFUL; | 137 | return PCIBIOS_SUCCESSFUL; |
139 | } | 138 | } |
140 | 139 | ||
141 | static int __devinit ssb_gige_pci_write_config(struct pci_bus *bus, | 140 | static int ssb_gige_pci_write_config(struct pci_bus *bus, unsigned int devfn, |
142 | unsigned int devfn, int reg, | 141 | int reg, int size, u32 val) |
143 | int size, u32 val) | ||
144 | { | 142 | { |
145 | struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops); | 143 | struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops); |
146 | unsigned long flags; | 144 | unsigned long flags; |
@@ -169,8 +167,8 @@ static int __devinit ssb_gige_pci_write_config(struct pci_bus *bus, | |||
169 | return PCIBIOS_SUCCESSFUL; | 167 | return PCIBIOS_SUCCESSFUL; |
170 | } | 168 | } |
171 | 169 | ||
172 | static int __devinit ssb_gige_probe(struct ssb_device *sdev, | 170 | static int ssb_gige_probe(struct ssb_device *sdev, |
173 | const struct ssb_device_id *id) | 171 | const struct ssb_device_id *id) |
174 | { | 172 | { |
175 | struct ssb_gige *dev; | 173 | struct ssb_gige *dev; |
176 | u32 base, tmslow, tmshigh; | 174 | u32 base, tmslow, tmshigh; |