diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-30 01:00:49 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2013-07-11 14:54:21 -0400 |
commit | ac1bb694c05302a0552c5a34ba701f246004bc03 (patch) | |
tree | 94c09b15dbe57d207a0ff11a226c2feb008dee2a /drivers/watchdog | |
parent | 626d65aa5255fdd98e62f74cf43d3166e9832fb2 (diff) |
watchdog: mv64x60_wdt: use devm_ioremap()
Use devm_ioremap() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/mv64x60_wdt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c index c7fb878ca493..e4cf98019265 100644 --- a/drivers/watchdog/mv64x60_wdt.c +++ b/drivers/watchdog/mv64x60_wdt.c | |||
@@ -276,7 +276,7 @@ static int mv64x60_wdt_probe(struct platform_device *dev) | |||
276 | if (!r) | 276 | if (!r) |
277 | return -ENODEV; | 277 | return -ENODEV; |
278 | 278 | ||
279 | mv64x60_wdt_regs = ioremap(r->start, resource_size(r)); | 279 | mv64x60_wdt_regs = devm_ioremap(&dev->dev, r->start, resource_size(r)); |
280 | if (mv64x60_wdt_regs == NULL) | 280 | if (mv64x60_wdt_regs == NULL) |
281 | return -ENOMEM; | 281 | return -ENOMEM; |
282 | 282 | ||
@@ -293,8 +293,6 @@ static int mv64x60_wdt_remove(struct platform_device *dev) | |||
293 | 293 | ||
294 | mv64x60_wdt_handler_disable(); | 294 | mv64x60_wdt_handler_disable(); |
295 | 295 | ||
296 | iounmap(mv64x60_wdt_regs); | ||
297 | |||
298 | return 0; | 296 | return 0; |
299 | } | 297 | } |
300 | 298 | ||