diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:07 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:43 -0500 |
| commit | 64bc40de134bb5c7826ff384016f654219ed3956 (patch) | |
| tree | 6e2451c6f7808874c25bdf6ebc338b9c8463f8c9 /drivers/net/ethernet/dlink/sundance.c | |
| parent | 6b6a3e7f65e5736030032b4d39901479ba437e5f (diff) | |
dlink: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.
Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/dlink/sundance.c')
| -rw-r--r-- | drivers/net/ethernet/dlink/sundance.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c index 3b83588e51f6..2a5a5b0a5cae 100644 --- a/drivers/net/ethernet/dlink/sundance.c +++ b/drivers/net/ethernet/dlink/sundance.c | |||
| @@ -102,7 +102,7 @@ static char *media[MAX_UNITS]; | |||
| 102 | #include <linux/mii.h> | 102 | #include <linux/mii.h> |
| 103 | 103 | ||
| 104 | /* These identify the driver base version and may not be removed. */ | 104 | /* These identify the driver base version and may not be removed. */ |
| 105 | static const char version[] __devinitconst = | 105 | static const char version[] = |
| 106 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE | 106 | KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE |
| 107 | " Written by Donald Becker\n"; | 107 | " Written by Donald Becker\n"; |
| 108 | 108 | ||
| @@ -218,7 +218,7 @@ enum { | |||
| 218 | struct pci_id_info { | 218 | struct pci_id_info { |
| 219 | const char *name; | 219 | const char *name; |
| 220 | }; | 220 | }; |
| 221 | static const struct pci_id_info pci_id_tbl[] __devinitconst = { | 221 | static const struct pci_id_info pci_id_tbl[] = { |
| 222 | {"D-Link DFE-550TX FAST Ethernet Adapter"}, | 222 | {"D-Link DFE-550TX FAST Ethernet Adapter"}, |
| 223 | {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"}, | 223 | {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"}, |
| 224 | {"D-Link DFE-580TX 4 port Server Adapter"}, | 224 | {"D-Link DFE-580TX 4 port Server Adapter"}, |
| @@ -472,8 +472,8 @@ static const struct net_device_ops netdev_ops = { | |||
| 472 | .ndo_validate_addr = eth_validate_addr, | 472 | .ndo_validate_addr = eth_validate_addr, |
| 473 | }; | 473 | }; |
| 474 | 474 | ||
| 475 | static int __devinit sundance_probe1 (struct pci_dev *pdev, | 475 | static int sundance_probe1(struct pci_dev *pdev, |
| 476 | const struct pci_device_id *ent) | 476 | const struct pci_device_id *ent) |
| 477 | { | 477 | { |
| 478 | struct net_device *dev; | 478 | struct net_device *dev; |
| 479 | struct netdev_private *np; | 479 | struct netdev_private *np; |
| @@ -701,7 +701,7 @@ static int change_mtu(struct net_device *dev, int new_mtu) | |||
| 701 | 701 | ||
| 702 | #define eeprom_delay(ee_addr) ioread32(ee_addr) | 702 | #define eeprom_delay(ee_addr) ioread32(ee_addr) |
| 703 | /* Read the EEPROM and MII Management Data I/O (MDIO) interfaces. */ | 703 | /* Read the EEPROM and MII Management Data I/O (MDIO) interfaces. */ |
| 704 | static int __devinit eeprom_read(void __iomem *ioaddr, int location) | 704 | static int eeprom_read(void __iomem *ioaddr, int location) |
| 705 | { | 705 | { |
| 706 | int boguscnt = 10000; /* Typical 1900 ticks. */ | 706 | int boguscnt = 10000; /* Typical 1900 ticks. */ |
| 707 | iowrite16(0x0200 | (location & 0xff), ioaddr + EECtrl); | 707 | iowrite16(0x0200 | (location & 0xff), ioaddr + EECtrl); |
| @@ -1844,7 +1844,7 @@ static int netdev_close(struct net_device *dev) | |||
| 1844 | return 0; | 1844 | return 0; |
| 1845 | } | 1845 | } |
| 1846 | 1846 | ||
| 1847 | static void __devexit sundance_remove1 (struct pci_dev *pdev) | 1847 | static void sundance_remove1(struct pci_dev *pdev) |
| 1848 | { | 1848 | { |
| 1849 | struct net_device *dev = pci_get_drvdata(pdev); | 1849 | struct net_device *dev = pci_get_drvdata(pdev); |
| 1850 | 1850 | ||
| @@ -1910,7 +1910,7 @@ static struct pci_driver sundance_driver = { | |||
| 1910 | .name = DRV_NAME, | 1910 | .name = DRV_NAME, |
| 1911 | .id_table = sundance_pci_tbl, | 1911 | .id_table = sundance_pci_tbl, |
| 1912 | .probe = sundance_probe1, | 1912 | .probe = sundance_probe1, |
| 1913 | .remove = __devexit_p(sundance_remove1), | 1913 | .remove = sundance_remove1, |
| 1914 | #ifdef CONFIG_PM | 1914 | #ifdef CONFIG_PM |
| 1915 | .suspend = sundance_suspend, | 1915 | .suspend = sundance_suspend, |
| 1916 | .resume = sundance_resume, | 1916 | .resume = sundance_resume, |