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

Commit 5f056bf0 authored by Charles Keepax's avatar Charles Keepax Committed by Lee Jones
Browse files

mfd: arizona: Use devres to manage reset GPIO 



This also handily fixes a leak of the GPIO in arizona_dev_exit.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 6c284c9a

drivers/mfd/arizona-core.c

+4 −6
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ int arizona_dev_init(struct arizona *arizona) 


	if (arizona->pdata.reset) {

		/* Start out with /RESET low to put the chip into reset */

		ret = gpio_request_one(arizona->pdata.reset,

		ret = devm_gpio_request_one(arizona->dev, arizona->pdata.reset,

					    GPIOF_DIR_OUT | GPIOF_INIT_LOW,

					    "arizona /RESET");

		if (ret != 0) {
@@ -1046,10 +1046,8 @@ int arizona_dev_init(struct arizona *arizona) 
err_irq:

	arizona_irq_exit(arizona);

err_reset:

	if (arizona->pdata.reset) {

	if (arizona->pdata.reset)

		gpio_set_value_cansleep(arizona->pdata.reset, 0);

		gpio_free(arizona->pdata.reset);

	}

	regulator_disable(arizona->dcvdd);

err_enable:

	regulator_bulk_disable(arizona->num_core_supplies,