redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Greg Kroah-Hartman 2012-12-21 15:12:59 -08:00
parent bcd2982a0e
commit 0f58a01ddd
8 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/bcma/bcma_private.h
View File

@ -22,7 +22,7 @@
struct bcma_bus; struct bcma_bus;
/* main.c */ /* 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); 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,
@ -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); extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc);
#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
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);
void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc); void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */ #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
#ifdef CONFIG_BCMA_DRIVER_GPIO #ifdef CONFIG_BCMA_DRIVER_GPIO

2
drivers/bcma/driver_gmac_cmn.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 __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); mutex_init(&gc->phy_mutex);
} }

4
drivers/bcma/driver_pci.c
View File

@ -207,14 +207,14 @@ static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc)
* Init. * 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_core_pci_fixcfg(pc);
bcma_pcicore_serdes_workaround(pc); bcma_pcicore_serdes_workaround(pc);
bcma_core_pci_config_fixup(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) if (pc->setup_done)
return; return;

13
drivers/bcma/driver_pci_host.c
View File

@ -24,7 +24,7 @@
#define BCMA_PCI_SLOT_MAX 16 #define BCMA_PCI_SLOT_MAX 16
#define PCI_CONFIG_SPACE_SIZE 256 #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; struct bcma_bus *bus = pc->core->bus;
u16 chipid_top; u16 chipid_top;
@ -264,10 +264,9 @@ static int bcma_core_pci_hostmode_write_config(struct pci_bus *bus,
} }
/* return cap_offset if requested capability exists in the PCI config space */ /* return cap_offset if requested capability exists in the PCI config space */
static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc, static u8 bcma_find_pci_capability(struct bcma_drv_pci *pc, unsigned int dev,
unsigned int dev, unsigned int func, u8 req_cap_id,
unsigned int func, u8 req_cap_id, unsigned char *buf, u32 *buflen)
unsigned char *buf, u32 *buflen)
{ {
u8 cap_id; u8 cap_id;
u8 cap_ptr = 0; u8 cap_ptr = 0;
@ -334,7 +333,7 @@ static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc,
* Retry Status (CRS) Completion Status to software then * Retry Status (CRS) Completion Status to software then
* enable the feature. * 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; struct bcma_bus *bus = pc->core->bus;
u8 cap_ptr, root_ctrl, root_cap, dev; 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_bus *bus = pc->core->bus;
struct bcma_drv_pci_host *pc_host; struct bcma_drv_pci_host *pc_host;

8
drivers/bcma/host_pci.c
View File

@ -155,8 +155,8 @@ static const struct bcma_host_ops bcma_host_pci_ops = {
.awrite32 = bcma_host_pci_awrite32, .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) const struct pci_device_id *id)
{ {
struct bcma_bus *bus; struct bcma_bus *bus;
int err = -ENOMEM; int err = -ENOMEM;
@ -226,7 +226,7 @@ err_kfree_bus:
return err; 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); struct bcma_bus *bus = pci_get_drvdata(dev);
@ -284,7 +284,7 @@ static struct pci_driver bcma_pci_bridge_driver = {
.name = "bcma-pci-bridge", .name = "bcma-pci-bridge",
.id_table = bcma_pci_bridge_tbl, .id_table = bcma_pci_bridge_tbl,
.probe = bcma_host_pci_probe, .probe = bcma_host_pci_probe,
.remove = __devexit_p(bcma_host_pci_remove), .remove = bcma_host_pci_remove,
.driver.pm = BCMA_PM_OPS, .driver.pm = BCMA_PM_OPS,
}; };

2
drivers/bcma/main.c
View File

@ -192,7 +192,7 @@ static void bcma_unregister_cores(struct bcma_bus *bus)
platform_device_unregister(bus->drv_cc.watchdog); platform_device_unregister(bus->drv_cc.watchdog);
} }
int __devinit bcma_bus_register(struct bcma_bus *bus) int 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_gmac_cmn.h
View File

@ -92,7 +92,7 @@ struct bcma_drv_gmac_cmn {
#define gmac_cmn_write32(gc, offset, val) bcma_write32((gc)->core, offset, val) #define gmac_cmn_write32(gc, offset, val) bcma_write32((gc)->core, offset, val)
#ifdef CONFIG_BCMA_DRIVER_GMAC_CMN #ifdef CONFIG_BCMA_DRIVER_GMAC_CMN
extern void __devinit bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc); extern void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc);
#else #else
static inline void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc) { } static inline void bcma_core_gmac_cmn_init(struct bcma_drv_gmac_cmn *gc) { }
#endif #endif

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

@ -214,7 +214,7 @@ struct bcma_drv_pci {
#define pcicore_write16(pc, offset, val) bcma_write16((pc)->core, offset, val) #define pcicore_write16(pc, offset, val) bcma_write16((pc)->core, offset, val)
#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 __devinit bcma_core_pci_init(struct bcma_drv_pci *pc); extern void 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);
extern void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend); extern void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend);