]> git.karo-electronics.de Git - linux-beck.git/commitdiff
gpio: cs5535: Switch to using managed resources with devm_
authorPramod Gurav <pramod.gurav@smartplayin.com>
Wed, 1 Oct 2014 10:46:33 +0000 (16:16 +0530)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 21 Oct 2014 08:51:11 +0000 (10:51 +0200)
This change switches to devm_request_region to request region
and hence simplifies the module unload and does away with
release_region in remove function.

Cc: linux-gpio@vger.kernel.org
Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-cs5535.c

index 668127fe90ef7dc63e5b4d9b7c8023af97e76069..71484eeb4ac2b2214cb6451a291d139f7570cb43 100644 (file)
@@ -322,7 +322,8 @@ static int cs5535_gpio_probe(struct platform_device *pdev)
                goto done;
        }
 
-       if (!request_region(res->start, resource_size(res), pdev->name)) {
+       if (!devm_request_region(&pdev->dev, res->start, resource_size(res),
+                                pdev->name)) {
                dev_err(&pdev->dev, "can't request region\n");
                goto done;
        }
@@ -348,24 +349,18 @@ static int cs5535_gpio_probe(struct platform_device *pdev)
        /* finally, register with the generic GPIO API */
        err = gpiochip_add(&cs5535_gpio_chip.chip);
        if (err)
-               goto release_region;
+               goto done;
 
        return 0;
 
-release_region:
-       release_region(res->start, resource_size(res));
 done:
        return err;
 }
 
 static int cs5535_gpio_remove(struct platform_device *pdev)
 {
-       struct resource *r;
-
        gpiochip_remove(&cs5535_gpio_chip.chip);
 
-       r = platform_get_resource(pdev, IORESOURCE_IO, 0);
-       release_region(r->start, resource_size(r));
        return 0;
 }