Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c87dc4e4 authored by Laxman Dewangan's avatar Laxman Dewangan
Browse files

gpio: wm8994: 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: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Cc: patches@opensource.wolfsonmicro.com
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
parent 4a4925cf

drivers/gpio/gpio-wm8994.c

+3 −14
Original line number Diff line number Diff line
@@ -261,34 +261,23 @@ static int wm8994_gpio_probe(struct platform_device *pdev) 
	else

		wm8994_gpio->gpio_chip.base = -1;



	ret = gpiochip_add_data(&wm8994_gpio->gpio_chip, wm8994_gpio);

	ret = devm_gpiochip_add_data(&pdev->dev, &wm8994_gpio->gpio_chip,

				     wm8994_gpio);

	if (ret < 0) {

		dev_err(&pdev->dev, "Could not register gpiochip, %d\n",

			ret);

		goto err;

		return ret;

	}



	platform_set_drvdata(pdev, wm8994_gpio);



	return ret;



err:

	return ret;

}



static int wm8994_gpio_remove(struct platform_device *pdev)

{

	struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);



	gpiochip_remove(&wm8994_gpio->gpio_chip);

	return 0;

}



static struct platform_driver wm8994_gpio_driver = {

	.driver.name	= "wm8994-gpio",

	.driver.owner	= THIS_MODULE,

	.probe		= wm8994_gpio_probe,

	.remove		= wm8994_gpio_remove,

};



static int __init wm8994_gpio_init(void)