diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-30 07:00:49 +0200 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2013-07-11 20:54:21 +0200 |
commit | ac1bb694c05302a0552c5a34ba701f246004bc03 (patch) | |
tree | 94c09b15dbe57d207a0ff11a226c2feb008dee2a /drivers/watchdog/mv64x60_wdt.c | |
parent | watchdog: bcm63xx_wdt: use devm_ioremap_nocache() (diff) | |
download | linux-ac1bb694c05302a0552c5a34ba701f246004bc03.tar.xz linux-ac1bb694c05302a0552c5a34ba701f246004bc03.zip |
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/mv64x60_wdt.c')
-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) if (!r) return -ENODEV; - mv64x60_wdt_regs = ioremap(r->start, resource_size(r)); + mv64x60_wdt_regs = devm_ioremap(&dev->dev, r->start, resource_size(r)); if (mv64x60_wdt_regs == NULL) return -ENOMEM; @@ -293,8 +293,6 @@ static int mv64x60_wdt_remove(struct platform_device *dev) mv64x60_wdt_handler_disable(); - iounmap(mv64x60_wdt_regs); - return 0; } |