aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2016-02-22 07:13:28 -0500
committerLaxman Dewangan <ldewangan@nvidia.com>2016-02-23 10:05:52 -0500
commit4a4925cf2bef99f2e6fff04b0f135dd400c119ac (patch)
tree74b77fbba888c2dc26b4245eeb8cad3dc7e3a687
parent61da4848a1ab6526ccdc0da4ed07635587dc478d (diff)
gpio: wm8350: Use devm_gpiochip_add_data() for gpio registration
Use devm_gpiochip_add_data() for GPIO registration and remove the need of driver callback .remove. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Cc: patches@opensource.wolfsonmicro.com Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
-rw-r--r--drivers/gpio/gpio-wm8350.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpio/gpio-wm8350.c b/drivers/gpio/gpio-wm8350.c
index 0a306b4baa73..07d45a3b205a 100644
--- a/drivers/gpio/gpio-wm8350.c
+++ b/drivers/gpio/gpio-wm8350.c
@@ -125,7 +125,8 @@ static int wm8350_gpio_probe(struct platform_device *pdev)
125 else 125 else
126 wm8350_gpio->gpio_chip.base = -1; 126 wm8350_gpio->gpio_chip.base = -1;
127 127
128 ret = gpiochip_add_data(&wm8350_gpio->gpio_chip, wm8350_gpio); 128 ret = devm_gpiochip_add_data(&pdev->dev, &wm8350_gpio->gpio_chip,
129 wm8350_gpio);
129 if (ret < 0) { 130 if (ret < 0) {
130 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); 131 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
131 return ret; 132 return ret;
@@ -136,19 +137,10 @@ static int wm8350_gpio_probe(struct platform_device *pdev)
136 return ret; 137 return ret;
137} 138}
138 139
139static int wm8350_gpio_remove(struct platform_device *pdev)
140{
141 struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);
142
143 gpiochip_remove(&wm8350_gpio->gpio_chip);
144 return 0;
145}
146
147static struct platform_driver wm8350_gpio_driver = { 140static struct platform_driver wm8350_gpio_driver = {
148 .driver.name = "wm8350-gpio", 141 .driver.name = "wm8350-gpio",
149 .driver.owner = THIS_MODULE, 142 .driver.owner = THIS_MODULE,
150 .probe = wm8350_gpio_probe, 143 .probe = wm8350_gpio_probe,
151 .remove = wm8350_gpio_remove,
152}; 144};
153 145
154static int __init wm8350_gpio_init(void) 146static int __init wm8350_gpio_init(void)