| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | --- a/driver/include/linuxver.h |
| 2 | +++ b/driver/include/linuxver.h |
| 3 | @@ -139,22 +139,6 @@ typedef struct pcmcia_device dev_link_t; |
| 4 | |
| 5 | #endif /* CONFIG_PCMCIA */ |
| 6 | |
| 7 | -#ifndef __exit |
| 8 | -#define __exit |
| 9 | -#endif |
| 10 | -#ifndef __devexit |
| 11 | -#define __devexit |
| 12 | -#endif |
| 13 | -#ifndef __devinit |
| 14 | -#define __devinit __init |
| 15 | -#endif |
| 16 | -#ifndef __devinitdata |
| 17 | -#define __devinitdata |
| 18 | -#endif |
| 19 | -#ifndef __devexit_p |
| 20 | -#define __devexit_p(x) x |
| 21 | -#endif |
| 22 | - |
| 23 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)) |
| 24 | |
| 25 | #define pci_get_drvdata(dev) (dev)->sysdata |
| 26 | --- a/driver/wl_linux.c |
| 27 | +++ b/driver/wl_linux.c |
| 28 | @@ -854,7 +854,7 @@ wl_read_proc(char *buffer, char **start, |
| 29 | */ |
| 30 | #if !defined(BCMJTAG) |
| 31 | #ifdef CONFIG_PCI |
| 32 | -static void __devexit wl_remove(struct pci_dev *pdev); |
| 33 | +static void wl_remove(struct pci_dev *pdev); |
| 34 | /** |
| 35 | * determines if a device is a WL device, and if so, attaches it. |
| 36 | * |
| 37 | @@ -862,7 +862,7 @@ static void __devexit wl_remove(struct p |
| 38 | * and if so, performs a wl_attach() on it. |
| 39 | * |
| 40 | */ |
| 41 | -int __devinit |
| 42 | +int |
| 43 | wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
| 44 | { |
| 45 | int rc; |
| 46 | @@ -976,7 +976,7 @@ wl_resume(struct pci_dev *pdev) |
| 47 | } |
| 48 | #endif /* LINUXSTA_PS */ |
| 49 | |
| 50 | -static void __devexit |
| 51 | +static void |
| 52 | wl_remove(struct pci_dev *pdev) |
| 53 | { |
| 54 | wl_info_t *wl = (wl_info_t *) pci_get_drvdata(pdev); |
| 55 | @@ -1007,7 +1007,7 @@ static struct pci_driver wl_pci_driver = |
| 56 | suspend: wl_suspend, |
| 57 | resume: wl_resume, |
| 58 | #endif /* LINUXSTA_PS */ |
| 59 | - remove: __devexit_p(wl_remove), |
| 60 | + remove: wl_remove, |
| 61 | id_table: wl_id_table, |
| 62 | }; |
| 63 | #endif /* CONFIG_PCI */ |
| 64 | --- a/driver/wl_linux.h |
| 65 | +++ b/driver/wl_linux.h |
| 66 | @@ -33,7 +33,7 @@ extern irqreturn_t wl_isr(int irq, void |
| 67 | extern irqreturn_t wl_isr(int irq, void *dev_id, struct pt_regs *ptregs); |
| 68 | #endif |
| 69 | |
| 70 | -extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); |
| 71 | +extern int wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); |
| 72 | extern void wl_free(wl_info_t *wl); |
| 73 | extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); |
| 74 | extern struct net_device * wl_netdev_get(wl_info_t *wl); |