From: Laxman Dewangan Date: Mon, 22 Feb 2016 12:13:28 +0000 (+0530) Subject: gpio: sch: Use devm_gpiochip_add_data() for gpio registration X-Git-Tag: v4.6-rc1~108^2~20^2^2~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1411464d2ca969f19ee42bcf8d8cfdda357abee;p=thirdparty%2Fkernel%2Flinux.git gpio: sch: 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 --- diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c index 5314ee4b947dd..e85e7539cf5d2 100644 --- a/drivers/gpio/gpio-sch.c +++ b/drivers/gpio/gpio-sch.c @@ -215,15 +215,7 @@ static int sch_gpio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, sch); - return gpiochip_add_data(&sch->chip, sch); -} - -static int sch_gpio_remove(struct platform_device *pdev) -{ - struct sch_gpio *sch = platform_get_drvdata(pdev); - - gpiochip_remove(&sch->chip); - return 0; + return devm_gpiochip_add_data(&pdev->dev, &sch->chip, sch); } static struct platform_driver sch_gpio_driver = { @@ -231,7 +223,6 @@ static struct platform_driver sch_gpio_driver = { .name = "sch_gpio", }, .probe = sch_gpio_probe, - .remove = sch_gpio_remove, }; module_platform_driver(sch_gpio_driver);