12 files changed, 96 insertions, 96 deletions

diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index 5c5eebdb6914..dcc98afa65d7 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -148,14 +148,6 @@ el2_pio_probe(struct net_device *dev)
     return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        /* NB: el2_close() handles free_irq */
-        release_region(dev->base_addr, EL2_IO_EXTENT);
-        if (ei_status.mem)
-                iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init el2_probe(int unit)
 {
@@ -726,6 +718,14 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        /* NB: el2_close() handles free_irq */
+        release_region(dev->base_addr, EL2_IO_EXTENT);
+        if (ei_status.mem)
+                iounmap(ei_status.mem);
+}
+
 void
 cleanup_module(void)
 {
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 8a0af5453e21..7952dc6d77e3 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -123,14 +123,6 @@ static int __init do_ac3200_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        /* Someday free_irq may be in ac_close_card() */
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, AC_IO_EXTENT);
-        iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init ac3200_probe(int unit)
 {
@@ -406,6 +398,14 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        /* Someday free_irq may be in ac_close_card() */
+        free_irq(dev->irq, dev);
+        release_region(dev->base_addr, AC_IO_EXTENT);
+        iounmap(ei_status.mem);
+}
+
 void
 cleanup_module(void)
 {
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index f5a4dd7d8564..e5c5cd2a2712 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -140,13 +140,6 @@ static int  __init do_e2100_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        /* NB: e21_close() handles free_irq */
-        iounmap(ei_status.mem);
-        release_region(dev->base_addr, E21_IO_EXTENT);
-}
-
 #ifndef MODULE
 struct net_device * __init e2100_probe(int unit)
 {
@@ -463,6 +456,13 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        /* NB: e21_close() handles free_irq */
+        iounmap(ei_status.mem);
+        release_region(dev->base_addr, E21_IO_EXTENT);
+}
+
 void
 cleanup_module(void)
 {
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 50f8e23bb9e5..6b0ab1eac3fb 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -155,13 +155,6 @@ static int __init do_es_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, ES_IO_EXTENT);
-        iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init es_probe(int unit)
 {
@@ -456,6 +449,13 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        free_irq(dev->irq, dev);
+        release_region(dev->base_addr, ES_IO_EXTENT);
+        iounmap(ei_status.mem);
+}
+
 void
 cleanup_module(void)
 {
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index 0abf5dd08b4c..74e167e7dea7 100644
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -138,12 +138,6 @@ static int __init do_hpp_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        /* NB: hpp_close() handles free_irq */
-        release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
-}
-
 #ifndef MODULE
 struct net_device * __init hp_plus_probe(int unit)
 {
@@ -473,6 +467,12 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        /* NB: hpp_close() handles free_irq */
+        release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
+}
+
 void
 cleanup_module(void)
 {
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 59cf841b14ab..cf9fb3698a6b 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -102,12 +102,6 @@ static int __init do_hp_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
-}
-
 #ifndef MODULE
 struct net_device * __init hp_probe(int unit)
 {
@@ -444,6 +438,12 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        free_irq(dev->irq, dev);
+        release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
+}
+
 void
 cleanup_module(void)
 {
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 1d75ca0bb939..d1d714faa6ce 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -309,17 +309,6 @@ static void lance_tx_timeout (struct net_device *dev);
 
 
 
-static void cleanup_card(struct net_device *dev)
-{
-        struct lance_private *lp = dev->priv;
-        if (dev->dma != 4)
-                free_dma(dev->dma);
-        release_region(dev->base_addr, LANCE_TOTAL_SIZE);
-        kfree(lp->tx_bounce_buffs);
-        kfree((void*)lp->rx_buffs);
-        kfree(lp);
-}
-
 #ifdef MODULE
 #define MAX_CARDS               8       /* Max number of interfaces (cards) per module */
 
@@ -367,6 +356,17 @@ int init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        struct lance_private *lp = dev->priv;
+        if (dev->dma != 4)
+                free_dma(dev->dma);
+        release_region(dev->base_addr, LANCE_TOTAL_SIZE);
+        kfree(lp->tx_bounce_buffs);
+        kfree((void*)lp->rx_buffs);
+        kfree(lp);
+}
+
 void cleanup_module(void)
 {
         int this_dev;
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c
index 309d254842cf..646e89fc3562 100644
--- a/drivers/net/lne390.c
+++ b/drivers/net/lne390.c
@@ -145,13 +145,6 @@ static int __init do_lne390_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, LNE390_IO_EXTENT);
-        iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init lne390_probe(int unit)
 {
@@ -440,6 +433,13 @@ int init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        free_irq(dev->irq, dev);
+        release_region(dev->base_addr, LNE390_IO_EXTENT);
+        iounmap(ei_status.mem);
+}
+
 void cleanup_module(void)
 {
         int this_dev;
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index 0de8fdd2aa86..94f782d51f0f 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -212,15 +212,6 @@ static int __init do_ne_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
-        if (idev)
-                pnp_device_detach(idev);
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, NE_IO_EXTENT);
-}
-
 #ifndef MODULE
 struct net_device * __init ne_probe(int unit)
 {
@@ -859,6 +850,15 @@ int init_module(void)
         return -ENODEV;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
+        if (idev)
+                pnp_device_detach(idev);
+        free_irq(dev->irq, dev);
+        release_region(dev->base_addr, NE_IO_EXTENT);
+}
+
 void cleanup_module(void)
 {
         int this_dev;
diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index 6d62ada85de6..e6df375a1d4b 100644
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -278,14 +278,6 @@ static int __init do_ne2_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        mca_mark_as_unused(ei_status.priv);
-        mca_set_adapter_procfn( ei_status.priv, NULL, NULL);
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, NE_IO_EXTENT);
-}
-
 #ifndef MODULE
 struct net_device * __init ne2_probe(int unit)
 {
@@ -812,6 +804,14 @@ int init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        mca_mark_as_unused(ei_status.priv);
+        mca_set_adapter_procfn( ei_status.priv, NULL, NULL);
+        free_irq(dev->irq, dev);
+        release_region(dev->base_addr, NE_IO_EXTENT);
+}
+
 void cleanup_module(void)
 {
         int this_dev;
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index ba8593ac3f8a..3db30cd0625e 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -168,18 +168,6 @@ static int __init do_ultra_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        /* NB: ultra_close_card() does free_irq */
-#ifdef __ISAPNP__
-        struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
-        if (idev)
-                pnp_device_detach(idev);
-#endif
-        release_region(dev->base_addr - ULTRA_NIC_OFFSET, ULTRA_IO_EXTENT);
-        iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init ultra_probe(int unit)
 {
@@ -594,6 +582,18 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        /* NB: ultra_close_card() does free_irq */
+#ifdef __ISAPNP__
+        struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
+        if (idev)
+                pnp_device_detach(idev);
+#endif
+        release_region(dev->base_addr - ULTRA_NIC_OFFSET, ULTRA_IO_EXTENT);
+        iounmap(ei_status.mem);
+}
+
 void
 cleanup_module(void)
 {
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index b03feae459fc..7caa8dc88a58 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -127,13 +127,6 @@ static int __init do_wd_probe(struct net_device *dev)
         return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
-        iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init wd_probe(int unit)
 {
@@ -538,6 +531,13 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        free_irq(dev->irq, dev);
+        release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
+        iounmap(ei_status.mem);
+}
+
 void
 cleanup_module(void)
 {