net driver janitor fixes:

* region resource handling
* do-while macro definitions
* error cleanup

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 01d144e50a8045d2a1448f2d49db9c8e2fc89061..ccd7c8e138c2ef89a7b093daae21d1aac6a770b5 100644 (file)
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -465,7 +465,7 @@ err_out:
 #define EE_DATA_READ   0x80    /* EEPROM chip data out, in reg. 17. */
 
 /* Delay between EEPROM clock transitions. */
-#define eeprom_delay() do {} while (0);
+#define eeprom_delay() do { } while (0)
 
 /* The EEPROM commands include the alway-set leading bit. */
 #define EE_WRITE_CMD   (5 << 6)

diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 771ab0c30533949f16c369ba461a13e75c89b4c4..03e504fa4b5b47eaba3d7a4b75695d16b6ddf8e5 100644 (file)
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -383,7 +383,7 @@ int __init lance_probe(struct net_device *dev)
                                        return 0;
                                }
                        }
-                       release_resource(r);
+                       release_region(ioaddr, LANCE_TOTAL_SIZE);
                }
        }
        return -ENODEV;

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index ecf6ec9b94a4247ab7a66bdc8c8691c126bf308c..66b5455f29c92c781feac1cbb9b0f427a2895dfc 100644 (file)
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -511,7 +511,6 @@ pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
                struct pci_dev *pdev)
 {
     struct pcnet32_private *lp;
-    struct resource *res;
     dma_addr_t lp_dma_addr;
     int i, media;
     int fdx, mii, fset, dxsuflo, ltint;
@@ -689,13 +688,12 @@ pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
     }
 
     dev->base_addr = ioaddr;
-    res = request_region(ioaddr, PCNET32_TOTAL_SIZE, chipname);
-    if (!res)
+    if (request_region(ioaddr, PCNET32_TOTAL_SIZE, chipname) == NULL)
        return -EBUSY;
     
     /* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */
     if ((lp = pci_alloc_consistent(pdev, sizeof(*lp), &lp_dma_addr)) == NULL) {
-       release_resource(res);
+       release_region(ioaddr, PCNET32_TOTAL_SIZE);
        return -ENOMEM;
     }
 
@@ -727,7 +725,7 @@ pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
     if (!a) {
       printk(KERN_ERR PFX "No access methods\n");
       pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
-      release_resource(res);
+      release_region(ioaddr, PCNET32_TOTAL_SIZE);
       return -ENODEV;
     }
     lp->a = *a;
@@ -775,7 +773,7 @@ pcnet32_probe1(unsigned long ioaddr, unsigned int irq_line, int shared,
        else {
            printk(", failed to detect IRQ line.\n");
            pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
-           release_resource(res);
+           release_region(ioaddr, PCNET32_TOTAL_SIZE);
            return -ENODEV;
        }
     }

diff --git a/drivers/net/wan/comx-hw-locomx.c b/drivers/net/wan/comx-hw-locomx.c
index 4f73023d6cd69800052c599eddb2475f0302ebba..76e41b5109ad3d35619b75e4d3a8d1915197ccca 100644 (file)
--- a/drivers/net/wan/comx-hw-locomx.c
+++ b/drivers/net/wan/comx-hw-locomx.c
@@ -154,12 +154,10 @@ static int LOCOMX_open(struct net_device *dev)
                return -ENODEV;
        }
 
-       if (check_region(dev->base_addr, hw->io_extent)) {
+       if (!request_region(dev->base_addr, hw->io_extent, dev->name)) {
                return -EAGAIN;
        }
 
-       request_region(dev->base_addr, hw->io_extent, dev->name);
-
        hw->board.chanA.ctrlio=dev->base_addr + 5;
        hw->board.chanA.dataio=dev->base_addr + 7;
        

diff --git a/drivers/net/wan/comx-hw-mixcom.c b/drivers/net/wan/comx-hw-mixcom.c
index 3936d97163e0f551c95e915b7a989ac3b231187a..59b39274833883c2dedb4c820ea4d94789dd700d 100644 (file)
--- a/drivers/net/wan/comx-hw-mixcom.c
+++ b/drivers/net/wan/comx-hw-mixcom.c
@@ -566,8 +566,6 @@ static int MIXCOM_open(struct net_device *dev)
 
        return 0;
        
-err_restore_flags:
-       restore_flags(flags);
 err_release_region:
        release_region(dev->base_addr, MIXCOM_IO_EXTENT);
 err_ret:

diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index b6c5f8701bbeed03d4f19b48e2826c58555bbd1d..1292a71c61ec7db36e2387f52ca56384eccdb5ec 100644 (file)
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -97,7 +97,7 @@ int __init wd_probe(struct net_device *dev)
                        return -EBUSY;
                i = wd_probe1(dev, base_addr);
                if (i != 0)  
-                       release_resource(r);
+                       release_region(base_addr, WD_IO_EXTENT);
                else
                        r->name = dev->name;
                return i;
@@ -114,7 +114,7 @@ int __init wd_probe(struct net_device *dev)
                        r->name = dev->name;
                        return 0;
                }
-               release_resource(r);
+               release_region(ioaddr, WD_IO_EXTENT);
        }
 
        return -ENODEV;