diff options
author | Julia Lawall <julia@diku.dk> | 2011-12-27 15:01:29 +0100 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2012-01-27 09:53:28 +0100 |
commit | 52ea9a7d7946c03aa1f9eeb71adb0191402724dd (patch) | |
tree | 6f5baeadfa623f1425453487a4cc7000f74752e2 /drivers/watchdog/dw_wdt.c | |
parent | 5d32d4868ad87a5be8571b22b3d732576504dfb0 (diff) | |
download | linux-stable-52ea9a7d7946c03aa1f9eeb71adb0191402724dd.tar.gz linux-stable-52ea9a7d7946c03aa1f9eeb71adb0191402724dd.tar.bz2 linux-stable-52ea9a7d7946c03aa1f9eeb71adb0191402724dd.zip |
watchdog: dw_wdt.c: use devm_request_and_ioremap
Reimplement a call to devm_request_mem_region followed by a call to ioremap
or ioremap_nocache by a call to devm_request_and_ioremap.
The semantic patch that makes this transformation is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@nm@
expression myname;
identifier i;
@@
struct platform_driver i = { .driver = { .name = myname } };
@@
expression dev,res,size;
expression nm.myname;
@@
-if (!devm_request_mem_region(dev, res->start, size,
- \(res->name\|dev_name(dev)\|myname\))) {
- ...
- return ...;
-}
... when != res->start
(
-devm_ioremap(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
|
-devm_ioremap_nocache(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
)
... when any
when != res->start
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/dw_wdt.c')
-rw-r--r-- | drivers/watchdog/dw_wdt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index 1b0e3dd81c1a..63d7b58f1c7d 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c @@ -300,11 +300,7 @@ static int __devinit dw_wdt_drv_probe(struct platform_device *pdev) if (!mem) return -EINVAL; - if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem), - "dw_wdt")) - return -ENOMEM; - - dw_wdt.regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); + dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem); if (!dw_wdt.regs) return -ENOMEM; |