]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drivers/net: Correct use of request_region/request_mem_region
authorJulia Lawall <julia@diku.dk>
Sat, 8 Aug 2009 21:43:42 +0000 (21:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Aug 2009 04:54:57 +0000 (21:54 -0700)
request_mem_region should be used with release_mem_region, not request_region.

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

// <smpl>
@r2@
expression start;
@@

request_mem_region(start,...)

@b2@
expression r2.start;
@@

request_region(start,...)

@depends on !b2@
expression r2.start;
expression E;
@@

- release_region
+ release_mem_region
  (start,E)
// </smpl>

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

index ec337b502fd9bb668a17ce7d56d61149caa8fbac..6e5b3f30527f048d0dca9ea6835d04f94e33202a 100644 (file)
@@ -203,7 +203,7 @@ static int __devinit sonic_probe1(struct net_device *dev)
 
        return 0;
 out:
-       release_region(dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
        return err;
 }
 
@@ -247,7 +247,7 @@ static int __devinit jazz_sonic_probe(struct platform_device *pdev)
        return 0;
 
 out1:
-       release_region(dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
 out:
        free_netdev(dev);
 
@@ -269,7 +269,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
        unregister_netdev(dev);
        dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
                          lp->descriptors, lp->descriptors_laddr);
-       release_region (dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
        free_netdev(dev);
 
        return 0;