drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region

Request_mem_region should be used with release_mem_region, not
release_resource.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,E;
@@
*x = request_mem_region(...)
... when != release_mem_region(x)
    when != x = E
* release_resource(x);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 7ca0eded2561c2261b16be4dbf1087214eb3b029..b7f45cd756a20dd166172c6e81fcea40ba1a5e0b 100644 (file)
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -182,14 +182,14 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
        return -EBUSY;
     r2 = request_mem_region(mem_start, ARIADNE_RAM_SIZE, "RAM");
     if (!r2) {
-       release_resource(r1);
+       release_mem_region(base_addr, sizeof(struct Am79C960));
        return -EBUSY;
     }
 
     dev = alloc_etherdev(sizeof(struct ariadne_private));
     if (dev == NULL) {
-       release_resource(r1);
-       release_resource(r2);
+       release_mem_region(base_addr, sizeof(struct Am79C960));
+       release_mem_region(mem_start, ARIADNE_RAM_SIZE);
        return -ENOMEM;
     }
 
@@ -213,8 +213,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
 
     err = register_netdev(dev);
     if (err) {
-       release_resource(r1);
-       release_resource(r2);
+       release_mem_region(base_addr, sizeof(struct Am79C960));
+       release_mem_region(mem_start, ARIADNE_RAM_SIZE);
        free_netdev(dev);
        return err;
     }