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

Commit 0f58a01d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: bcma: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: "Rafał Miłecki" <zajec5@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bcd2982a

drivers/bcma/bcma_private.h

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
struct bcma_bus;



/* main.c */

int __devinit bcma_bus_register(struct bcma_bus *bus);

int 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,
@@ -87,8 +87,8 @@ u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address); 
extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc);



#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE

bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);

void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);

bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);

void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);

#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */



#ifdef CONFIG_BCMA_DRIVER_GPIO

drivers/bcma/driver_gmac_cmn.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 __devinit bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc)

void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc)

{

	mutex_init(&gc->phy_mutex);

}

drivers/bcma/driver_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -207,14 +207,14 @@ static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc) 
 * Init.

 **************************************************/



static void __devinit bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)

static void bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)

{

	bcma_core_pci_fixcfg(pc);

	bcma_pcicore_serdes_workaround(pc);

	bcma_core_pci_config_fixup(pc);

}



void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)

void bcma_core_pci_init(struct bcma_drv_pci *pc)

{

	if (pc->setup_done)

		return;

drivers/bcma/driver_pci_host.c

+6 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define BCMA_PCI_SLOT_MAX	16

#define	PCI_CONFIG_SPACE_SIZE	256



bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)

bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)

{

	struct bcma_bus *bus = pc->core->bus;

	u16 chipid_top;
@@ -264,8 +264,7 @@ static int bcma_core_pci_hostmode_write_config(struct pci_bus *bus, 
}



/* return cap_offset if requested capability exists in the PCI config space */

static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc,

					     unsigned int dev,

static u8 bcma_find_pci_capability(struct bcma_drv_pci *pc, unsigned int dev,

				   unsigned int func, u8 req_cap_id,

				   unsigned char *buf, u32 *buflen)

{
@@ -334,7 +333,7 @@ static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc, 
 * Retry Status (CRS) Completion Status to software then

 * enable the feature.

 */

static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc)

static void bcma_core_pci_enable_crs(struct bcma_drv_pci *pc)

{

	struct bcma_bus *bus = pc->core->bus;

	u8 cap_ptr, root_ctrl, root_cap, dev;
@@ -381,7 +380,7 @@ static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc) 
	}

}



void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)

void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)

{

	struct bcma_bus *bus = pc->core->bus;

	struct bcma_drv_pci_host *pc_host;

drivers/bcma/host_pci.c

+4 −4
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static const struct bcma_host_ops bcma_host_pci_ops = { 
	.awrite32	= bcma_host_pci_awrite32,

};



static int __devinit bcma_host_pci_probe(struct pci_dev *dev,

static int bcma_host_pci_probe(struct pci_dev *dev,

			       const struct pci_device_id *id)

{

	struct bcma_bus *bus;
@@ -226,7 +226,7 @@ static int __devinit bcma_host_pci_probe(struct pci_dev *dev, 
	return err;

}



static void __devexit bcma_host_pci_remove(struct pci_dev *dev)

static void bcma_host_pci_remove(struct pci_dev *dev)

{

	struct bcma_bus *bus = pci_get_drvdata(dev);
@@ -284,7 +284,7 @@ static struct pci_driver bcma_pci_bridge_driver = { 
	.name = "bcma-pci-bridge",

	.id_table = bcma_pci_bridge_tbl,

	.probe = bcma_host_pci_probe,

	.remove = __devexit_p(bcma_host_pci_remove),

	.remove = bcma_host_pci_remove,

	.driver.pm = BCMA_PM_OPS,

};