gpio: cs5535: Switch to using managed resources with devm_

Pramod Gurav · linusw · commit 3eebd6132283 · 2014-10-21T10:51:11.000+02:00
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 &lt;pramod.gurav@smartplayin.com&gt;
Reviewed-by: Alexandre Courbot &lt;acourbot@nvidia.com&gt;
Signed-off-by: Linus Walleij &lt;linus.walleij@linaro.org&gt;
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,8 @@ static int cs5535_gpio_probe(struct platform_device *pdev)`
`322`	`322`	`goto done;`
`323`	`323`	`}`
`324`	`324`
`325`		`- if (!request_region(res->start, resource_size(res), pdev->name)) {`
	`325`	`+ if (!devm_request_region(&pdev->dev, res->start, resource_size(res),`
	`326`	`+ pdev->name)) {`
`326`	`327`	`dev_err(&pdev->dev, "can't request region\n");`
`327`	`328`	`goto done;`
`328`	`329`	`}`
`@@ -348,24 +349,18 @@ static int cs5535_gpio_probe(struct platform_device *pdev)`
`348`	`349`	`/* finally, register with the generic GPIO API */`
`349`	`350`	`err = gpiochip_add(&cs5535_gpio_chip.chip);`
`350`	`351`	`if (err)`
`351`		`- goto release_region;`
	`352`	`+ goto done;`
`352`	`353`
`353`	`354`	`return 0;`
`354`	`355`
`355`		`-release_region:`
`356`		`- release_region(res->start, resource_size(res));`
`357`	`356`	`done:`
`358`	`357`	`return err;`
`359`	`358`	`}`
`360`	`359`
`361`	`360`	`static int cs5535_gpio_remove(struct platform_device *pdev)`
`362`	`361`	`{`
`363`		`- struct resource *r;`
`364`		`-`
`365`	`362`	`gpiochip_remove(&cs5535_gpio_chip.chip);`
`366`	`363`
`367`		`- r = platform_get_resource(pdev, IORESOURCE_IO, 0);`
`368`		`- release_region(r->start, resource_size(r));`
`369`	`364`	`return 0;`
`370`	`365`	`}`
`371`	`366`