iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcma: make some functions __devinit

Browse Source 
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>
This commit is contained in:
Hauke Mehrtens 2012-01-31 00:03:34 +01:00 committed by John W. Linville
parent 4b259a5cc5
commit d1a7a8e1d3
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/bcma/bcma_private.h
View File

@ -13,7 +13,7 @@
struct bcma_bus; struct bcma_bus;
/* main.c */ /* main.c */
int bcma_bus_register(struct bcma_bus *bus); int __devinit bcma_bus_register(struct bcma_bus *bus);
void bcma_bus_unregister(struct bcma_bus *bus); void bcma_bus_unregister(struct bcma_bus *bus);
int __init bcma_bus_early_register(struct bcma_bus *bus, int __init bcma_bus_early_register(struct bcma_bus *bus,
struct bcma_device *core_cc, struct bcma_device *core_cc,
@ -52,7 +52,7 @@ extern void __exit bcma_host_pci_exit(void);
u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address); u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc); void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */ #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
#endif #endif

6
drivers/bcma/driver_pci.c
View File

@ -174,12 +174,12 @@ static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc)
* Init. * Init.
**************************************************/ **************************************************/
static void bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc) static void __devinit bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
{ {
bcma_pcicore_serdes_workaround(pc); bcma_pcicore_serdes_workaround(pc);
} }
static bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc) static bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
{ {
struct bcma_bus *bus = pc->core->bus; struct bcma_bus *bus = pc->core->bus;
u16 chipid_top; u16 chipid_top;
@ -204,7 +204,7 @@ static bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
return true; return true;
} }
void bcma_core_pci_init(struct bcma_drv_pci *pc) void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
{ {
if (pc->setup_done) if (pc->setup_done)
return; return;

2
drivers/bcma/driver_pci_host.c
View File

@ -8,7 +8,7 @@
#include "bcma_private.h" #include "bcma_private.h"
#include <linux/bcma/bcma.h> #include <linux/bcma/bcma.h>
void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
{ {
pr_err("No support for PCI core in hostmode yet\n"); pr_err("No support for PCI core in hostmode yet\n");
} }

4
drivers/bcma/host_pci.c
View File

@ -154,8 +154,8 @@ const struct bcma_host_ops bcma_host_pci_ops = {
.awrite32 = bcma_host_pci_awrite32, .awrite32 = bcma_host_pci_awrite32,
}; };
static int bcma_host_pci_probe(struct pci_dev *dev, static int __devinit bcma_host_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct bcma_bus *bus; struct bcma_bus *bus;
int err = -ENOMEM; int err = -ENOMEM;

2
drivers/bcma/main.c
View File

@ -132,7 +132,7 @@ static void bcma_unregister_cores(struct bcma_bus *bus)
} }
} }
int bcma_bus_register(struct bcma_bus *bus) int __devinit bcma_bus_register(struct bcma_bus *bus)
{ {
int err; int err;
struct bcma_device *core; struct bcma_device *core;

2
include/linux/bcma/bcma_driver_pci.h
View File

@ -169,7 +169,7 @@ struct bcma_drv_pci {
#define pcicore_read32(pc, offset) bcma_read32((pc)->core, offset) #define pcicore_read32(pc, offset) bcma_read32((pc)->core, offset)
#define pcicore_write32(pc, offset, val) bcma_write32((pc)->core, offset, val) #define pcicore_write32(pc, offset, val) bcma_write32((pc)->core, offset, val)
extern void bcma_core_pci_init(struct bcma_drv_pci *pc); extern void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc);
extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
struct bcma_device *core, bool enable); struct bcma_device *core, bool enable);