5 files changed, 26 insertions, 26 deletions

diff --git a/drivers/net/ethernet/8390/etherh.c b/drivers/net/ethernet/8390/etherh.c
index 6414e84516c0..78c6fb4b1143 100644
--- a/drivers/net/ethernet/8390/etherh.c
+++ b/drivers/net/ethernet/8390/etherh.c
@@ -521,7 +521,7 @@ static void __init etherh_banner(void)
  * Read the ethernet address string from the on board rom.
  * This is an ascii string...
  */
-static int __devinit etherh_addr(char *addr, struct expansion_card *ec)
+static int etherh_addr(char *addr, struct expansion_card *ec)
 {
         struct in_chunk_dir cd;
         char *s;
@@ -651,7 +651,7 @@ static const struct net_device_ops etherh_netdev_ops = {
 static u32 etherh_regoffsets[16];
 static u32 etherm_regoffsets[16];
 
-static int __devinit
+static int
 etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         const struct etherh_data *data = id->data;
@@ -769,7 +769,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         return ret;
 }
 
-static void __devexit etherh_remove(struct expansion_card *ec)
+static void etherh_remove(struct expansion_card *ec)
 {
         struct net_device *dev = ecard_get_drvdata(ec);
 
@@ -833,7 +833,7 @@ static const struct ecard_id etherh_ids[] = {
 
 static struct ecard_driver etherh_driver = {
         .probe          = etherh_probe,
-        .remove         = __devexit_p(etherh_remove),
+        .remove         = etherh_remove,
         .id_table       = etherh_ids,
         .drv = {
                 .name   = DRV_NAME,
diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c
index 5370c884620b..bc81de1b7d4f 100644
--- a/drivers/net/ethernet/8390/hydra.c
+++ b/drivers/net/ethernet/8390/hydra.c
@@ -53,9 +53,9 @@ static const char version[] =
 #define WORDSWAP(a)     ((((a)>>8)&0xff) | ((a)<<8))
 
 
-static int __devinit hydra_init_one(struct zorro_dev *z,
+static int hydra_init_one(struct zorro_dev *z,
                                     const struct zorro_device_id *ent);
-static int __devinit hydra_init(struct zorro_dev *z);
+static int hydra_init(struct zorro_dev *z);
 static int hydra_open(struct net_device *dev);
 static int hydra_close(struct net_device *dev);
 static void hydra_reset_8390(struct net_device *dev);
@@ -65,9 +65,9 @@ static void hydra_block_input(struct net_device *dev, int count,
                               struct sk_buff *skb, int ring_offset);
 static void hydra_block_output(struct net_device *dev, int count,
                                const unsigned char *buf, int start_page);
-static void __devexit hydra_remove_one(struct zorro_dev *z);
+static void hydra_remove_one(struct zorro_dev *z);
 
-static struct zorro_device_id hydra_zorro_tbl[] __devinitdata = {
+static struct zorro_device_id hydra_zorro_tbl[] = {
     { ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET },
     { 0 }
 };
@@ -77,10 +77,10 @@ static struct zorro_driver hydra_driver = {
     .name       = "hydra",
     .id_table   = hydra_zorro_tbl,
     .probe      = hydra_init_one,
-    .remove     = __devexit_p(hydra_remove_one),
+    .remove     = hydra_remove_one,
 };
 
-static int __devinit hydra_init_one(struct zorro_dev *z,
+static int hydra_init_one(struct zorro_dev *z,
                                     const struct zorro_device_id *ent)
 {
     int err;
@@ -110,7 +110,7 @@ static const struct net_device_ops hydra_netdev_ops = {
 #endif
 };
 
-static int __devinit hydra_init(struct zorro_dev *z)
+static int hydra_init(struct zorro_dev *z)
 {
     struct net_device *dev;
     unsigned long board = ZTWO_VADDR(z->resource.start);
@@ -247,7 +247,7 @@ static void hydra_block_output(struct net_device *dev, int count,
     z_memcpy_toio(mem_base+((start_page - NESM_START_PG)<<8), buf, count);
 }
 
-static void __devexit hydra_remove_one(struct zorro_dev *z)
+static void hydra_remove_one(struct zorro_dev *z)
 {
     struct net_device *dev = zorro_get_drvdata(z);
 
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 5e8845febfb8..c0c127913dec 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -61,7 +61,7 @@ static int options[MAX_UNITS];
 #include "8390.h"
 
 /* These identify the driver base version and may not be removed. */
-static const char version[] __devinitconst =
+static const char version[] =
         KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE
         " D. Becker/P. Gortmaker\n";
 
@@ -119,7 +119,7 @@ enum ne2k_pci_chipsets {
 static struct {
         char *name;
         int flags;
-} pci_clone_list[] __devinitdata = {
+} pci_clone_list[] = {
         {"RealTek RTL-8029", REALTEK_FDX},
         {"Winbond 89C940", 0},
         {"Compex RL2000", 0},
@@ -215,8 +215,8 @@ static const struct net_device_ops ne2k_netdev_ops = {
 #endif
 };
 
-static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
-                                     const struct pci_device_id *ent)
+static int ne2k_pci_init_one(struct pci_dev *pdev,
+                             const struct pci_device_id *ent)
 {
         struct net_device *dev;
         int i;
@@ -647,7 +647,7 @@ static const struct ethtool_ops ne2k_pci_ethtool_ops = {
         .get_drvinfo            = ne2k_pci_get_drvinfo,
 };
 
-static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev)
+static void ne2k_pci_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
 
@@ -696,7 +696,7 @@ static int ne2k_pci_resume (struct pci_dev *pdev)
 static struct pci_driver ne2k_driver = {
         .name           = DRV_NAME,
         .probe          = ne2k_pci_init_one,
-        .remove         = __devexit_p(ne2k_pci_remove_one),
+        .remove         = ne2k_pci_remove_one,
         .id_table       = ne2k_pci_tbl,
 #ifdef CONFIG_PM
         .suspend        = ne2k_pci_suspend,
diff --git a/drivers/net/ethernet/8390/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
index e3f57427d5c5..ebcdb52ec739 100644
--- a/drivers/net/ethernet/8390/ne3210.c
+++ b/drivers/net/ethernet/8390/ne3210.c
@@ -222,7 +222,7 @@ static int __init ne3210_eisa_probe (struct device *device)
         return retval;
 }
 
-static int __devexit ne3210_eisa_remove (struct device *device)
+static int ne3210_eisa_remove(struct device *device)
 {
         struct net_device  *dev    = dev_get_drvdata(device);
         unsigned long       ioaddr = to_eisa_device (device)->base_addr;
@@ -324,7 +324,7 @@ static struct eisa_driver ne3210_eisa_driver = {
         .driver   = {
                 .name   = "ne3210",
                 .probe  = ne3210_eisa_probe,
-                .remove = __devexit_p (ne3210_eisa_remove),
+                .remove = ne3210_eisa_remove,
         },
 };
 
diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index 7818e6397e91..ceb89d90230e 100644
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
@@ -75,7 +75,7 @@ static struct card_info {
         zorro_id id;
         const char *name;
         unsigned int offset;
-} cards[] __devinitdata = {
+} cards[] = {
         { ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, "Ariadne II", 0x0600 },
         { ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, "X-Surf", 0x8600 },
 };
@@ -254,7 +254,7 @@ static int zorro8390_close(struct net_device *dev)
         return 0;
 }
 
-static void __devexit zorro8390_remove_one(struct zorro_dev *z)
+static void zorro8390_remove_one(struct zorro_dev *z)
 {
         struct net_device *dev = zorro_get_drvdata(z);
 
@@ -264,7 +264,7 @@ static void __devexit zorro8390_remove_one(struct zorro_dev *z)
         free_netdev(dev);
 }
 
-static struct zorro_device_id zorro8390_zorro_tbl[] __devinitdata = {
+static struct zorro_device_id zorro8390_zorro_tbl[] = {
         { ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, },
         { ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, },
         { 0 }
@@ -286,7 +286,7 @@ static const struct net_device_ops zorro8390_netdev_ops = {
 #endif
 };
 
-static int __devinit zorro8390_init(struct net_device *dev,
+static int zorro8390_init(struct net_device *dev,
                                     unsigned long board, const char *name,
                                     unsigned long ioaddr)
 {
@@ -396,7 +396,7 @@ static int __devinit zorro8390_init(struct net_device *dev,
         return 0;
 }
 
-static int __devinit zorro8390_init_one(struct zorro_dev *z,
+static int zorro8390_init_one(struct zorro_dev *z,
                                         const struct zorro_device_id *ent)
 {
         struct net_device *dev;
@@ -432,7 +432,7 @@ static struct zorro_driver zorro8390_driver = {
         .name           = "zorro8390",
         .id_table       = zorro8390_zorro_tbl,
         .probe          = zorro8390_init_one,
-        .remove         = __devexit_p(zorro8390_remove_one),
+        .remove         = zorro8390_remove_one,
 };
 
 static int __init zorro8390_init_module(void)