diff options
author | Julia Lawall <julia@diku.dk> | 2009-08-08 17:43:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-13 00:54:57 -0400 |
commit | c9145a2df072f75d97592ddac1624baeb7bad195 (patch) | |
tree | 436ff02613b350bd54a75c20b25dc465f17a6770 /drivers/net | |
parent | bdf50d7346588b22fd66367ae2890e2cbf574172 (diff) |
drivers/net: Correct use of request_region/request_mem_region
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/jazzsonic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index ec337b502fd9..6e5b3f30527f 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c | |||
@@ -203,7 +203,7 @@ static int __devinit sonic_probe1(struct net_device *dev) | |||
203 | 203 | ||
204 | return 0; | 204 | return 0; |
205 | out: | 205 | out: |
206 | release_region(dev->base_addr, SONIC_MEM_SIZE); | 206 | release_mem_region(dev->base_addr, SONIC_MEM_SIZE); |
207 | return err; | 207 | return err; |
208 | } | 208 | } |
209 | 209 | ||
@@ -247,7 +247,7 @@ static int __devinit jazz_sonic_probe(struct platform_device *pdev) | |||
247 | return 0; | 247 | return 0; |
248 | 248 | ||
249 | out1: | 249 | out1: |
250 | release_region(dev->base_addr, SONIC_MEM_SIZE); | 250 | release_mem_region(dev->base_addr, SONIC_MEM_SIZE); |
251 | out: | 251 | out: |
252 | free_netdev(dev); | 252 | free_netdev(dev); |
253 | 253 | ||
@@ -269,7 +269,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev) | |||
269 | unregister_netdev(dev); | 269 | unregister_netdev(dev); |
270 | dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), | 270 | dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), |
271 | lp->descriptors, lp->descriptors_laddr); | 271 | lp->descriptors, lp->descriptors_laddr); |
272 | release_region (dev->base_addr, SONIC_MEM_SIZE); | 272 | release_mem_region(dev->base_addr, SONIC_MEM_SIZE); |
273 | free_netdev(dev); | 273 | free_netdev(dev); |
274 | 274 | ||
275 | return 0; | 275 | return 0; |