030-remove_devinit_devexit.patch 2.0 KB

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