aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:23:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:16:52 -0500
commit779c1a85813a4622cc3bb3d25ce10b523bd055ba (patch)
tree43bb8c4e8079f1f67ebbc14f7955cf800614543e /drivers/net/ethernet
parentf3f9e50927b6c4791bf81dacae8bf5e7832b535d (diff)
tulip: 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> Cc: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/dec/tulip/de2104x.c17
-rw-r--r--drivers/net/ethernet/dec/tulip/de4x5.c18
-rw-r--r--drivers/net/ethernet/dec/tulip/dmfe.c12
-rw-r--r--drivers/net/ethernet/dec/tulip/eeprom.c10
-rw-r--r--drivers/net/ethernet/dec/tulip/media.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/tulip_core.c14
-rw-r--r--drivers/net/ethernet/dec/tulip/uli526x.c12
-rw-r--r--drivers/net/ethernet/dec/tulip/winbond-840.c10
-rw-r--r--drivers/net/ethernet/dec/tulip/xircom_cb.c6
9 files changed, 51 insertions, 50 deletions
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 77335853ac36..0918e3879abe 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -1700,7 +1700,7 @@ static const struct ethtool_ops de_ethtool_ops = {
1700 .get_regs = de_get_regs, 1700 .get_regs = de_get_regs,
1701}; 1701};
1702 1702
1703static void __devinit de21040_get_mac_address (struct de_private *de) 1703static void de21040_get_mac_address(struct de_private *de)
1704{ 1704{
1705 unsigned i; 1705 unsigned i;
1706 1706
@@ -1721,7 +1721,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
1721 } 1721 }
1722} 1722}
1723 1723
1724static void __devinit de21040_get_media_info(struct de_private *de) 1724static void de21040_get_media_info(struct de_private *de)
1725{ 1725{
1726 unsigned int i; 1726 unsigned int i;
1727 1727
@@ -1748,7 +1748,8 @@ static void __devinit de21040_get_media_info(struct de_private *de)
1748} 1748}
1749 1749
1750/* Note: this routine returns extra data bits for size detection. */ 1750/* Note: this routine returns extra data bits for size detection. */
1751static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, int addr_len) 1751static unsigned tulip_read_eeprom(void __iomem *regs, int location,
1752 int addr_len)
1752{ 1753{
1753 int i; 1754 int i;
1754 unsigned retval = 0; 1755 unsigned retval = 0;
@@ -1783,7 +1784,7 @@ static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, in
1783 return retval; 1784 return retval;
1784} 1785}
1785 1786
1786static void __devinit de21041_get_srom_info (struct de_private *de) 1787static void de21041_get_srom_info(struct de_private *de)
1787{ 1788{
1788 unsigned i, sa_offset = 0, ofs; 1789 unsigned i, sa_offset = 0, ofs;
1789 u8 ee_data[DE_EEPROM_SIZE + 6] = {}; 1790 u8 ee_data[DE_EEPROM_SIZE + 6] = {};
@@ -1961,8 +1962,8 @@ static const struct net_device_ops de_netdev_ops = {
1961 .ndo_validate_addr = eth_validate_addr, 1962 .ndo_validate_addr = eth_validate_addr,
1962}; 1963};
1963 1964
1964static int __devinit de_init_one (struct pci_dev *pdev, 1965static int de_init_one(struct pci_dev *pdev,
1965 const struct pci_device_id *ent) 1966 const struct pci_device_id *ent)
1966{ 1967{
1967 struct net_device *dev; 1968 struct net_device *dev;
1968 struct de_private *de; 1969 struct de_private *de;
@@ -2099,7 +2100,7 @@ err_out_free:
2099 return rc; 2100 return rc;
2100} 2101}
2101 2102
2102static void __devexit de_remove_one (struct pci_dev *pdev) 2103static void de_remove_one(struct pci_dev *pdev)
2103{ 2104{
2104 struct net_device *dev = pci_get_drvdata(pdev); 2105 struct net_device *dev = pci_get_drvdata(pdev);
2105 struct de_private *de = netdev_priv(dev); 2106 struct de_private *de = netdev_priv(dev);
@@ -2184,7 +2185,7 @@ static struct pci_driver de_driver = {
2184 .name = DRV_NAME, 2185 .name = DRV_NAME,
2185 .id_table = de_pci_tbl, 2186 .id_table = de_pci_tbl,
2186 .probe = de_init_one, 2187 .probe = de_init_one,
2187 .remove = __devexit_p(de_remove_one), 2188 .remove = de_remove_one,
2188#ifdef CONFIG_PM 2189#ifdef CONFIG_PM
2189 .suspend = de_suspend, 2190 .suspend = de_suspend,
2190 .resume = de_resume, 2191 .resume = de_resume,
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index f879e9224846..c411aedd8e60 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -479,7 +479,7 @@
479 479
480#include "de4x5.h" 480#include "de4x5.h"
481 481
482static const char version[] __devinitconst = 482static const char version[] =
483 KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n"; 483 KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n";
484 484
485#define c_char const char 485#define c_char const char
@@ -1092,7 +1092,7 @@ static const struct net_device_ops de4x5_netdev_ops = {
1092}; 1092};
1093 1093
1094 1094
1095static int __devinit 1095static int
1096de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) 1096de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
1097{ 1097{
1098 char name[DE4X5_NAME_LENGTH + 1]; 1098 char name[DE4X5_NAME_LENGTH + 1];
@@ -2077,7 +2077,7 @@ static int __init de4x5_eisa_probe (struct device *gendev)
2077 return status; 2077 return status;
2078} 2078}
2079 2079
2080static int __devexit de4x5_eisa_remove (struct device *device) 2080static int de4x5_eisa_remove(struct device *device)
2081{ 2081{
2082 struct net_device *dev; 2082 struct net_device *dev;
2083 u_long iobase; 2083 u_long iobase;
@@ -2104,7 +2104,7 @@ static struct eisa_driver de4x5_eisa_driver = {
2104 .driver = { 2104 .driver = {
2105 .name = "de4x5", 2105 .name = "de4x5",
2106 .probe = de4x5_eisa_probe, 2106 .probe = de4x5_eisa_probe,
2107 .remove = __devexit_p (de4x5_eisa_remove), 2107 .remove = de4x5_eisa_remove,
2108 } 2108 }
2109}; 2109};
2110MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); 2110MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
@@ -2118,7 +2118,7 @@ MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
2118** DECchips, we can find the base SROM irrespective of the BIOS scan direction. 2118** DECchips, we can find the base SROM irrespective of the BIOS scan direction.
2119** For single port cards this is a time waster... 2119** For single port cards this is a time waster...
2120*/ 2120*/
2121static void __devinit 2121static void
2122srom_search(struct net_device *dev, struct pci_dev *pdev) 2122srom_search(struct net_device *dev, struct pci_dev *pdev)
2123{ 2123{
2124 u_char pb; 2124 u_char pb;
@@ -2192,8 +2192,8 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
2192** kernels use the V0.535[n] drivers. 2192** kernels use the V0.535[n] drivers.
2193*/ 2193*/
2194 2194
2195static int __devinit de4x5_pci_probe (struct pci_dev *pdev, 2195static int de4x5_pci_probe(struct pci_dev *pdev,
2196 const struct pci_device_id *ent) 2196 const struct pci_device_id *ent)
2197{ 2197{
2198 u_char pb, pbus = 0, dev_num, dnum = 0, timer; 2198 u_char pb, pbus = 0, dev_num, dnum = 0, timer;
2199 u_short vendor, status; 2199 u_short vendor, status;
@@ -2314,7 +2314,7 @@ static int __devinit de4x5_pci_probe (struct pci_dev *pdev,
2314 return error; 2314 return error;
2315} 2315}
2316 2316
2317static void __devexit de4x5_pci_remove (struct pci_dev *pdev) 2317static void de4x5_pci_remove(struct pci_dev *pdev)
2318{ 2318{
2319 struct net_device *dev; 2319 struct net_device *dev;
2320 u_long iobase; 2320 u_long iobase;
@@ -2344,7 +2344,7 @@ static struct pci_driver de4x5_pci_driver = {
2344 .name = "de4x5", 2344 .name = "de4x5",
2345 .id_table = de4x5_pci_tbl, 2345 .id_table = de4x5_pci_tbl,
2346 .probe = de4x5_pci_probe, 2346 .probe = de4x5_pci_probe,
2347 .remove = __devexit_p (de4x5_pci_remove), 2347 .remove = de4x5_pci_remove,
2348}; 2348};
2349 2349
2350#endif 2350#endif
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index d23755ea9bc7..56a8fe7d4ef2 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -291,8 +291,8 @@ enum dmfe_CR6_bits {
291}; 291};
292 292
293/* Global variable declaration ----------------------------- */ 293/* Global variable declaration ----------------------------- */
294static int __devinitdata printed_version; 294static int printed_version;
295static const char version[] __devinitconst = 295static const char version[] =
296 "Davicom DM9xxx net driver, version " DRV_VERSION " (" DRV_RELDATE ")"; 296 "Davicom DM9xxx net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
297 297
298static int dmfe_debug; 298static int dmfe_debug;
@@ -367,8 +367,8 @@ static const struct net_device_ops netdev_ops = {
367 * Search DM910X board ,allocate space and register it 367 * Search DM910X board ,allocate space and register it
368 */ 368 */
369 369
370static int __devinit dmfe_init_one (struct pci_dev *pdev, 370static int dmfe_init_one(struct pci_dev *pdev,
371 const struct pci_device_id *ent) 371 const struct pci_device_id *ent)
372{ 372{
373 struct dmfe_board_info *db; /* board information structure */ 373 struct dmfe_board_info *db; /* board information structure */
374 struct net_device *dev; 374 struct net_device *dev;
@@ -531,7 +531,7 @@ err_out_free:
531} 531}
532 532
533 533
534static void __devexit dmfe_remove_one (struct pci_dev *pdev) 534static void dmfe_remove_one(struct pci_dev *pdev)
535{ 535{
536 struct net_device *dev = pci_get_drvdata(pdev); 536 struct net_device *dev = pci_get_drvdata(pdev);
537 struct dmfe_board_info *db = netdev_priv(dev); 537 struct dmfe_board_info *db = netdev_priv(dev);
@@ -2187,7 +2187,7 @@ static struct pci_driver dmfe_driver = {
2187 .name = "dmfe", 2187 .name = "dmfe",
2188 .id_table = dmfe_pci_tbl, 2188 .id_table = dmfe_pci_tbl,
2189 .probe = dmfe_init_one, 2189 .probe = dmfe_init_one,
2190 .remove = __devexit_p(dmfe_remove_one), 2190 .remove = dmfe_remove_one,
2191 .suspend = dmfe_suspend, 2191 .suspend = dmfe_suspend,
2192 .resume = dmfe_resume 2192 .resume = dmfe_resume
2193}; 2193};
diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
index 44f7e8e82d85..df5a892fb49c 100644
--- a/drivers/net/ethernet/dec/tulip/eeprom.c
+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28/* Known cards that have old-style EEPROMs. */ 28/* Known cards that have old-style EEPROMs. */
29static struct eeprom_fixup eeprom_fixups[] __devinitdata = { 29static struct eeprom_fixup eeprom_fixups[] = {
30 {"Asante", 0, 0, 0x94, {0x1e00, 0x0000, 0x0800, 0x0100, 0x018c, 30 {"Asante", 0, 0, 0x94, {0x1e00, 0x0000, 0x0800, 0x0100, 0x018c,
31 0x0000, 0x0000, 0xe078, 0x0001, 0x0050, 0x0018 }}, 31 0x0000, 0x0000, 0xe078, 0x0001, 0x0050, 0x0018 }},
32 {"SMC9332DST", 0, 0, 0xC0, { 0x1e00, 0x0000, 0x0800, 0x041f, 32 {"SMC9332DST", 0, 0, 0xC0, { 0x1e00, 0x0000, 0x0800, 0x041f,
@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
79 {NULL}}; 79 {NULL}};
80 80
81 81
82static const char *const block_name[] __devinitconst = { 82static const char *const block_name[] = {
83 "21140 non-MII", 83 "21140 non-MII",
84 "21140 MII PHY", 84 "21140 MII PHY",
85 "21142 Serial PHY", 85 "21142 Serial PHY",
@@ -102,7 +102,7 @@ static const char *const block_name[] __devinitconst = {
102 * #ifdef __hppa__ should completely optimize this function away for 102 * #ifdef __hppa__ should completely optimize this function away for
103 * non-parisc hardware. 103 * non-parisc hardware.
104 */ 104 */
105static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp) 105static void tulip_build_fake_mediatable(struct tulip_private *tp)
106{ 106{
107#ifdef CONFIG_GSC 107#ifdef CONFIG_GSC
108 if (tp->flags & NEEDS_FAKE_MEDIA_TABLE) { 108 if (tp->flags & NEEDS_FAKE_MEDIA_TABLE) {
@@ -140,7 +140,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
140#endif 140#endif
141} 141}
142 142
143void __devinit tulip_parse_eeprom(struct net_device *dev) 143void tulip_parse_eeprom(struct net_device *dev)
144{ 144{
145 /* 145 /*
146 dev is not registered at this point, so logging messages can't 146 dev is not registered at this point, so logging messages can't
@@ -339,7 +339,7 @@ subsequent_board:
339#define EE_READ_CMD (6) 339#define EE_READ_CMD (6)
340 340
341/* Note: this routine returns extra data bits for size detection. */ 341/* Note: this routine returns extra data bits for size detection. */
342int __devinit tulip_read_eeprom(struct net_device *dev, int location, int addr_len) 342int tulip_read_eeprom(struct net_device *dev, int location, int addr_len)
343{ 343{
344 int i; 344 int i;
345 unsigned retval = 0; 345 unsigned retval = 0;
diff --git a/drivers/net/ethernet/dec/tulip/media.c b/drivers/net/ethernet/dec/tulip/media.c
index ae937c6749e7..93a4afaa09f1 100644
--- a/drivers/net/ethernet/dec/tulip/media.c
+++ b/drivers/net/ethernet/dec/tulip/media.c
@@ -447,7 +447,7 @@ int tulip_check_duplex(struct net_device *dev)
447 return 0; 447 return 0;
448} 448}
449 449
450void __devinit tulip_find_mii (struct net_device *dev, int board_idx) 450void tulip_find_mii(struct net_device *dev, int board_idx)
451{ 451{
452 struct tulip_private *tp = netdev_priv(dev); 452 struct tulip_private *tp = netdev_priv(dev);
453 int phyn, phy_idx = 0; 453 int phyn, phy_idx = 0;
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 885700a19978..157c8e6e93f9 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -37,7 +37,7 @@
37#include <asm/prom.h> 37#include <asm/prom.h>
38#endif 38#endif
39 39
40static char version[] __devinitdata = 40static char version[] =
41 "Linux Tulip driver version " DRV_VERSION " (" DRV_RELDATE ")\n"; 41 "Linux Tulip driver version " DRV_VERSION " (" DRV_RELDATE ")\n";
42 42
43/* A few user-configurable values. */ 43/* A few user-configurable values. */
@@ -1191,8 +1191,8 @@ static void set_rx_mode(struct net_device *dev)
1191} 1191}
1192 1192
1193#ifdef CONFIG_TULIP_MWI 1193#ifdef CONFIG_TULIP_MWI
1194static void __devinit tulip_mwi_config (struct pci_dev *pdev, 1194static void tulip_mwi_config(struct pci_dev *pdev,
1195 struct net_device *dev) 1195 struct net_device *dev)
1196{ 1196{
1197 struct tulip_private *tp = netdev_priv(dev); 1197 struct tulip_private *tp = netdev_priv(dev);
1198 u8 cache; 1198 u8 cache;
@@ -1301,8 +1301,8 @@ DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = {
1301 { }, 1301 { },
1302}; 1302};
1303 1303
1304static int __devinit tulip_init_one (struct pci_dev *pdev, 1304static int tulip_init_one(struct pci_dev *pdev,
1305 const struct pci_device_id *ent) 1305 const struct pci_device_id *ent)
1306{ 1306{
1307 struct tulip_private *tp; 1307 struct tulip_private *tp;
1308 /* See note below on the multiport cards. */ 1308 /* See note below on the multiport cards. */
@@ -1927,7 +1927,7 @@ static int tulip_resume(struct pci_dev *pdev)
1927#endif /* CONFIG_PM */ 1927#endif /* CONFIG_PM */
1928 1928
1929 1929
1930static void __devexit tulip_remove_one (struct pci_dev *pdev) 1930static void tulip_remove_one(struct pci_dev *pdev)
1931{ 1931{
1932 struct net_device *dev = pci_get_drvdata (pdev); 1932 struct net_device *dev = pci_get_drvdata (pdev);
1933 struct tulip_private *tp; 1933 struct tulip_private *tp;
@@ -1974,7 +1974,7 @@ static struct pci_driver tulip_driver = {
1974 .name = DRV_NAME, 1974 .name = DRV_NAME,
1975 .id_table = tulip_pci_tbl, 1975 .id_table = tulip_pci_tbl,
1976 .probe = tulip_init_one, 1976 .probe = tulip_init_one,
1977 .remove = __devexit_p(tulip_remove_one), 1977 .remove = tulip_remove_one,
1978#ifdef CONFIG_PM 1978#ifdef CONFIG_PM
1979 .suspend = tulip_suspend, 1979 .suspend = tulip_suspend,
1980 .resume = tulip_resume, 1980 .resume = tulip_resume,
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index 75d45f8a37dc..93845afe1cea 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -204,8 +204,8 @@ enum uli526x_CR6_bits {
204}; 204};
205 205
206/* Global variable declaration ----------------------------- */ 206/* Global variable declaration ----------------------------- */
207static int __devinitdata printed_version; 207static int printed_version;
208static const char version[] __devinitconst = 208static const char version[] =
209 "ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")"; 209 "ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
210 210
211static int uli526x_debug; 211static int uli526x_debug;
@@ -281,8 +281,8 @@ static const struct net_device_ops netdev_ops = {
281 * Search ULI526X board, allocate space and register it 281 * Search ULI526X board, allocate space and register it
282 */ 282 */
283 283
284static int __devinit uli526x_init_one (struct pci_dev *pdev, 284static int uli526x_init_one(struct pci_dev *pdev,
285 const struct pci_device_id *ent) 285 const struct pci_device_id *ent)
286{ 286{
287 struct uli526x_board_info *db; /* board information structure */ 287 struct uli526x_board_info *db; /* board information structure */
288 struct net_device *dev; 288 struct net_device *dev;
@@ -436,7 +436,7 @@ err_out_free:
436} 436}
437 437
438 438
439static void __devexit uli526x_remove_one (struct pci_dev *pdev) 439static void uli526x_remove_one(struct pci_dev *pdev)
440{ 440{
441 struct net_device *dev = pci_get_drvdata(pdev); 441 struct net_device *dev = pci_get_drvdata(pdev);
442 struct uli526x_board_info *db = netdev_priv(dev); 442 struct uli526x_board_info *db = netdev_priv(dev);
@@ -1788,7 +1788,7 @@ static struct pci_driver uli526x_driver = {
1788 .name = "uli526x", 1788 .name = "uli526x",
1789 .id_table = uli526x_pci_tbl, 1789 .id_table = uli526x_pci_tbl,
1790 .probe = uli526x_init_one, 1790 .probe = uli526x_init_one,
1791 .remove = __devexit_p(uli526x_remove_one), 1791 .remove = uli526x_remove_one,
1792 .suspend = uli526x_suspend, 1792 .suspend = uli526x_suspend,
1793 .resume = uli526x_resume, 1793 .resume = uli526x_resume,
1794}; 1794};
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 7c1ec4d7920b..0a1bda857e76 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -236,7 +236,7 @@ struct pci_id_info {
236 int drv_flags; /* Driver use, intended as capability flags. */ 236 int drv_flags; /* Driver use, intended as capability flags. */
237}; 237};
238 238
239static const struct pci_id_info pci_id_tbl[] __devinitconst = { 239static const struct pci_id_info pci_id_tbl[] = {
240 { /* Sometime a Level-One switch card. */ 240 { /* Sometime a Level-One switch card. */
241 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII}, 241 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
242 { "Winbond W89c840", CanHaveMII | HasBrokenTx}, 242 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
@@ -358,8 +358,8 @@ static const struct net_device_ops netdev_ops = {
358 .ndo_validate_addr = eth_validate_addr, 358 .ndo_validate_addr = eth_validate_addr,
359}; 359};
360 360
361static int __devinit w840_probe1 (struct pci_dev *pdev, 361static int w840_probe1(struct pci_dev *pdev,
362 const struct pci_device_id *ent) 362 const struct pci_device_id *ent)
363{ 363{
364 struct net_device *dev; 364 struct net_device *dev;
365 struct netdev_private *np; 365 struct netdev_private *np;
@@ -1532,7 +1532,7 @@ static int netdev_close(struct net_device *dev)
1532 return 0; 1532 return 0;
1533} 1533}
1534 1534
1535static void __devexit w840_remove1 (struct pci_dev *pdev) 1535static void w840_remove1(struct pci_dev *pdev)
1536{ 1536{
1537 struct net_device *dev = pci_get_drvdata(pdev); 1537 struct net_device *dev = pci_get_drvdata(pdev);
1538 1538
@@ -1647,7 +1647,7 @@ static struct pci_driver w840_driver = {
1647 .name = DRV_NAME, 1647 .name = DRV_NAME,
1648 .id_table = w840_pci_tbl, 1648 .id_table = w840_pci_tbl,
1649 .probe = w840_probe1, 1649 .probe = w840_probe1,
1650 .remove = __devexit_p(w840_remove1), 1650 .remove = w840_remove1,
1651#ifdef CONFIG_PM 1651#ifdef CONFIG_PM
1652 .suspend = w840_suspend, 1652 .suspend = w840_suspend,
1653 .resume = w840_resume, 1653 .resume = w840_resume,
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index 138bf83bc98e..88feced9a629 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -148,7 +148,7 @@ static struct pci_driver xircom_ops = {
148 .name = "xircom_cb", 148 .name = "xircom_cb",
149 .id_table = xircom_pci_table, 149 .id_table = xircom_pci_table,
150 .probe = xircom_probe, 150 .probe = xircom_probe,
151 .remove = __devexit_p(xircom_remove), 151 .remove = xircom_remove,
152}; 152};
153 153
154 154
@@ -190,7 +190,7 @@ static const struct net_device_ops netdev_ops = {
190 first two packets that get send, and pump hates that. 190 first two packets that get send, and pump hates that.
191 191
192 */ 192 */
193static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id) 193static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id)
194{ 194{
195 struct device *d = &pdev->dev; 195 struct device *d = &pdev->dev;
196 struct net_device *dev = NULL; 196 struct net_device *dev = NULL;
@@ -312,7 +312,7 @@ err_disable:
312 Interrupts and such are already stopped in the "ifconfig ethX down" 312 Interrupts and such are already stopped in the "ifconfig ethX down"
313 code. 313 code.
314 */ 314 */
315static void __devexit xircom_remove(struct pci_dev *pdev) 315static void xircom_remove(struct pci_dev *pdev)
316{ 316{
317 struct net_device *dev = pci_get_drvdata(pdev); 317 struct net_device *dev = pci_get_drvdata(pdev);
318 struct xircom_private *card = netdev_priv(dev); 318 struct xircom_private *card = netdev_priv(dev);