Merge tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[cascardo/linux.git] / drivers / gpio / gpio-cs5535.c

diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
index 668127f..7b0b198 100644 (file)
--- a/drivers/gpio/gpio-cs5535.c
+++ b/drivers/gpio/gpio-cs5535.c
@@ -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,31 +349,24 @@ 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;
 }
 
 static struct platform_driver cs5535_gpio_driver = {
        .driver = {
                .name = DRV_NAME,
-               .owner = THIS_MODULE,
        },
        .probe = cs5535_gpio_probe,
        .remove = cs5535_gpio_remove,