summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-cs5535.c
diff options
context:
space:
mode:
authorPramod Gurav <pramod.gurav@smartplayin.com>2014-10-01 16:16:33 +0530
committerLinus Walleij <linus.walleij@linaro.org>2014-10-21 10:51:11 +0200
commit3eebd61322835565bbcb1745bf9bd44e86ff80ca (patch)
tree9ece37ba895d02dd78178cd4fee1dc3afa1b8f5f /drivers/gpio/gpio-cs5535.c
parent4515b76d9b158ae89db094fe0fb277eaac88be25 (diff)
downloadlinux-stable-3eebd61322835565bbcb1745bf9bd44e86ff80ca.tar.gz
linux-stable-3eebd61322835565bbcb1745bf9bd44e86ff80ca.tar.bz2
linux-stable-3eebd61322835565bbcb1745bf9bd44e86ff80ca.zip
gpio: cs5535: Switch to using managed resources with devm_
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>
Diffstat (limited to 'drivers/gpio/gpio-cs5535.c')
-rw-r--r--drivers/gpio/gpio-cs5535.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
index 668127fe90ef..71484eeb4ac2 100644
--- 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,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;
}