Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1a7a8e1 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

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: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4b259a5c

drivers/bcma/bcma_private.h

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
struct bcma_bus;



/* 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);

int __init bcma_bus_early_register(struct bcma_bus *bus,

				   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);



#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

drivers/bcma/driver_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -174,12 +174,12 @@ static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc) 
 * 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);

}



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;

	u16 chipid_top;
@@ -204,7 +204,7 @@ static bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc) 
	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)

		return;

drivers/bcma/driver_pci_host.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "bcma_private.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");

}

drivers/bcma/host_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ const struct bcma_host_ops bcma_host_pci_ops = { 
	.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)

{

	struct bcma_bus *bus;

drivers/bcma/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	struct bcma_device *core;