diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-01-18 11:48:29 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-01-18 11:50:56 -0800 |
| commit | 5c0529035e00b7f0345921371e96afa635a87dd0 (patch) | |
| tree | 4f3ffb94b106d191f752ebbde994080206ac5ebc | |
| parent | 39c4b71cfce520d736b3a9ab1039b8d6ec9bdfc8 (diff) | |
| download | linux-topics-5c0529035e00b7f0345921371e96afa635a87dd0.tar.gz | |
bcmhd: Remove __devinit and __devexit usage
As of 3.8-rc4, _devinit and __devexit are removed.
Reported-by: Jon Medhurst (Tixy) <tixy@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | drivers/net/wireless/bcmdhd/bcmsdh_linux.c | 12 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/include/linuxver.h | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_linux.c b/drivers/net/wireless/bcmdhd/bcmsdh_linux.c index 79760eb2423..30d0d14d12a 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_linux.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_linux.c @@ -142,8 +142,8 @@ EXPORT_SYMBOL(bcmsdh_remove); #else /* forward declarations */ -static int __devinit bcmsdh_probe(struct device *dev); -static int __devexit bcmsdh_remove(struct device *dev); +static int bcmsdh_probe(struct device *dev); +static int bcmsdh_remove(struct device *dev); #endif /* BCMLXSDMMC */ #ifndef BCMLXSDMMC @@ -296,8 +296,8 @@ int bcmsdh_remove(struct device *dev) #if !defined(BCMLXSDMMC) /* forward declarations for PCI probe and remove functions. */ -static int __devinit bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); -static void __devexit bcmsdh_pci_remove(struct pci_dev *pdev); +static int bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); +static void bcmsdh_pci_remove(struct pci_dev *pdev); /** * pci id table @@ -350,7 +350,7 @@ module_param(sd_pci_slot, uint, 0); * Determine if the device described by pdev is a supported SDIO Host * Controller. If so, attach to it and attach to the target device. */ -static int __devinit +static int bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { osl_t *osh = NULL; @@ -478,7 +478,7 @@ err: /** * Detach from target devices and SDIO Host Controller */ -static void __devexit +static void bcmsdh_pci_remove(struct pci_dev *pdev) { bcmsdh_hc_t *sdhc, *prev; diff --git a/drivers/net/wireless/bcmdhd/include/linuxver.h b/drivers/net/wireless/bcmdhd/include/linuxver.h index e59ac886f75..c77ce558f5c 100644 --- a/drivers/net/wireless/bcmdhd/include/linuxver.h +++ b/drivers/net/wireless/bcmdhd/include/linuxver.h @@ -165,12 +165,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs *ptregs); #ifndef __exit #define __exit #endif -#ifndef __devexit -#define __devexit -#endif -#ifndef __devinit -#define __devinit __init -#endif #ifndef __devinitdata #define __devinitdata #endif |