From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Mon, 22 Feb 2016 12:13:28 +0000 (+0530)
Subject: gpio: timberdale Use devm_gpiochip_add_data() for gpio registration
X-Git-Tag: v4.6-rc1~108^2~20^2^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43fad8322a9757b73402accd8247a9479d927149;p=thirdparty%2Flinux.git

gpio: timberdale Use devm_gpiochip_add_data() for gpio registration

Use devm_gpiochip_add_data() for GPIO registration.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index a6de10c5275b0..f0164ec43921e 100644
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -279,7 +279,7 @@ static int timbgpio_probe(struct platform_device *pdev)
 	gc->ngpio = pdata->nr_pins;
 	gc->can_sleep = false;
 
-	err = gpiochip_add_data(gc, tgpio);
+	err = devm_gpiochip_add_data(&pdev->dev, gc, tgpio);
 	if (err)
 		return err;
 
@@ -320,8 +320,6 @@ static int timbgpio_remove(struct platform_device *pdev)
 		irq_set_handler_data(irq, NULL);
 	}
 
-	gpiochip_remove(&tgpio->gpio);
-
 	return 0;
 }