Thread (78 messages) 78 messages, 8 authors, 2016-02-28

[PATCH 06/61] gpio: adp5520: Use devm_gpiochip_add_data() for gpio registration

From: michael.hennerich@analog.com (Michael Hennerich)
Date: 2016-02-23 07:57:16
Also in: linux-gpio, linux-tegra, lkml

On 02/22/2016 03:07 PM, Laxman Dewangan wrote:
Use devm_gpiochip_add_data() for GPIO registration and remove the
call for gpiochip_remove() from error path.

Also remove the need of driver callback .remove.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
quoted hunk ↗ jump to hunk
Cc: Michael Hennerich <michael.hennerich@analog.com>
---
  drivers/gpio/gpio-adp5520.c | 13 +------------
  1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index 4fa7ff1..abf1996 100644
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -153,7 +153,7 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
  		goto err;
  	}

-	ret = gpiochip_add_data(&dev->gpio_chip, dev);
+	ret = devm_gpiochip_add_data(&pdev->dev, &dev->gpio_chip, dev);
  	if (ret)
  		goto err;
@@ -164,22 +164,11 @@ err:
  	return ret;
  }

-static int adp5520_gpio_remove(struct platform_device *pdev)
-{
-	struct adp5520_gpio *dev;
-
-	dev = platform_get_drvdata(pdev);
-	gpiochip_remove(&dev->gpio_chip);
-
-	return 0;
-}
-
  static struct platform_driver adp5520_gpio_driver = {
  	.driver	= {
  		.name	= "adp5520-gpio",
  	},
  	.probe		= adp5520_gpio_probe,
-	.remove		= adp5520_gpio_remove,
  };

  module_platform_driver(adp5520_gpio_driver);

-- 
Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help