]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
leds: leds-cobalt-raq: use devm_ioremap
authorJingoo Han <jg1.han@samsung.com>
Tue, 23 Oct 2012 12:20:50 +0000 (05:20 -0700)
committerBryan Wu <cooloney@gmail.com>
Mon, 26 Nov 2012 22:28:45 +0000 (14:28 -0800)
The devm_ functions allocate memory that is released when a driver
detaches. This patch uses devm_ioremap() for these functions.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
drivers/leds/leds-cobalt-raq.c

index aac1c073fe7bb20b018553c7e5c89e0fe084a8cc..7e41aa91bc560bcfb47bead87b3f1642024b39f6 100644 (file)
@@ -85,13 +85,13 @@ static int __devinit cobalt_raq_led_probe(struct platform_device *pdev)
        if (!res)
                return -EBUSY;
 
-       led_port = ioremap(res->start, resource_size(res));
+       led_port = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (!led_port)
                return -ENOMEM;
 
        retval = led_classdev_register(&pdev->dev, &raq_power_off_led);
        if (retval)
-               goto err_iounmap;
+               goto err_null;
 
        retval = led_classdev_register(&pdev->dev, &raq_web_led);
        if (retval)
@@ -102,8 +102,7 @@ static int __devinit cobalt_raq_led_probe(struct platform_device *pdev)
 err_unregister:
        led_classdev_unregister(&raq_power_off_led);
 
-err_iounmap:
-       iounmap(led_port);
+err_null:
        led_port = NULL;
 
        return retval;
@@ -114,10 +113,8 @@ static int __devexit cobalt_raq_led_remove(struct platform_device *pdev)
        led_classdev_unregister(&raq_power_off_led);
        led_classdev_unregister(&raq_web_led);
 
-       if (led_port) {
-               iounmap(led_port);
+       if (led_port)
                led_port = NULL;
-       }
 
        return 0;
 }