Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d1a7a8e1d367e34e5adce91f48cae07dc08d9e6c

Authored by Hauke Mehrtens
Committed by John W. Linville
1 parent 4b259a5cc5
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

bcma: make some functions __devinit 

bcma_core_pci_hostmode_init() has to be in __devinit as it will call a
function in that section and so all functions calling it also have to
be in __devinit.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 6 changed files with 10 additions and 10 deletions Side-by-side Diff

drivers/bcma/bcma_private.h
Diff comments   View file @ d1a7a8e
... ... @@ -13,7 +13,7 @@
13 13 struct bcma_bus;
14 14  
15 15 /* main.c */
16   -int bcma_bus_register(struct bcma_bus *bus);
  16 +int __devinit bcma_bus_register(struct bcma_bus *bus);
17 17 void bcma_bus_unregister(struct bcma_bus *bus);
18 18 int __init bcma_bus_early_register(struct bcma_bus *bus,
19 19 struct bcma_device *core_cc,
... ... @@ -52,7 +52,7 @@
52 52 u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
53 53  
54 54 #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
55   -void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
  55 +void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
56 56 #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
57 57  
58 58 #endif
drivers/bcma/driver_pci.c
Diff comments   View file @ d1a7a8e
... ... @@ -174,12 +174,12 @@
174 174 * Init.
175 175 **************************************************/
176 176  
177   -static void bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
  177 +static void __devinit bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
178 178 {
179 179 bcma_pcicore_serdes_workaround(pc);
180 180 }
181 181  
182   -static bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
  182 +static bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
183 183 {
184 184 struct bcma_bus *bus = pc->core->bus;
185 185 u16 chipid_top;
... ... @@ -204,7 +204,7 @@
204 204 return true;
205 205 }
206 206  
207   -void bcma_core_pci_init(struct bcma_drv_pci *pc)
  207 +void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
208 208 {
209 209 if (pc->setup_done)
210 210 return;
drivers/bcma/driver_pci_host.c
Diff comments   View file @ d1a7a8e
... ... @@ -8,7 +8,7 @@
8 8 #include "bcma_private.h"
9 9 #include <linux/bcma/bcma.h>
10 10  
11   -void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
  11 +void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
12 12 {
13 13 pr_err("No support for PCI core in hostmode yet\n");
14 14 }
drivers/bcma/host_pci.c
Diff comments   View file @ d1a7a8e
... ... @@ -154,8 +154,8 @@
154 154 .awrite32 = bcma_host_pci_awrite32,
155 155 };
156 156  
157   -static int bcma_host_pci_probe(struct pci_dev *dev,
158   - const struct pci_device_id *id)
  157 +static int __devinit bcma_host_pci_probe(struct pci_dev *dev,
  158 + const struct pci_device_id *id)
159 159 {
160 160 struct bcma_bus *bus;
161 161 int err = -ENOMEM;
... ... @@ -132,7 +132,7 @@
132 132 }
133 133 }
134 134  
135   -int bcma_bus_register(struct bcma_bus *bus)
  135 +int __devinit bcma_bus_register(struct bcma_bus *bus)
136 136 {
137 137 int err;
138 138 struct bcma_device *core;
include/linux/bcma/bcma_driver_pci.h
Diff comments   View file @ d1a7a8e
... ... @@ -169,7 +169,7 @@
169 169 #define pcicore_read32(pc, offset) bcma_read32((pc)->core, offset)
170 170 #define pcicore_write32(pc, offset, val) bcma_write32((pc)->core, offset, val)
171 171  
172   -extern void bcma_core_pci_init(struct bcma_drv_pci *pc);
  172 +extern void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc);
173 173 extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
174 174 struct bcma_device *core, bool enable);
175 175