watchdog: mv64x60_wdt: use devm_ioremap()
authorJingoo Han <jg1.han@samsung.com>
Tue, 30 Apr 2013 05:00:49 +0000 (14:00 +0900)
committerWim Van Sebroeck <wim@iguana.be>
Thu, 11 Jul 2013 18:54:21 +0000 (20:54 +0200)
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>
drivers/watchdog/mv64x60_wdt.c

index c7fb878ca4935a338c52c7315eb226e1bc76316c..e4cf980192658fa1d02959ba55e69ec03dc24ea0 100644 (file)
@@ -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;
 }