[PATCH] pinctrl: st: Add remove function and remove gpio_chip on failure
From: Pramod Gurav <hidden>
Date: 2014-08-30 14:46:20
Also in:
lkml
Subsystem:
arm/sti architecture, pin control subsystem, the rest · Maintainers:
Patrice Chotard, Linus Walleij, Linus Torvalds
This patch adds a remove function to platform_driver to unload the driver in a cleaner way. This also releases gpiochip related resources by calling gpiochip_remove when gpiochip_irqchip_add fails. CC: Srinivas Kandagatla <redacted> CC: Srinivas Kandagatla <redacted> CC: Maxime Coquelin <redacted> CC: Patrice Chotard <redacted> CC: Linus Walleij <redacted> CC: Bjorn Andersson <redacted> Signed-off-by: Pramod Gurav <redacted> --- drivers/pinctrl/pinctrl-st.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
index 5475374..9296845 100644
--- a/drivers/pinctrl/pinctrl-st.c
+++ b/drivers/pinctrl/pinctrl-st.c@@ -1517,6 +1517,7 @@ static int st_gpiolib_register_bank(struct st_pinctrl *info, 0, handle_simple_irq, IRQ_TYPE_LEVEL_LOW); if (err) { + gpiochip_remove(&bank->gpio_chip); dev_info(dev, "could not add irqchip\n"); return err; }
@@ -1685,6 +1686,29 @@ static int st_pctl_probe(struct platform_device *pdev) return 0; } +static int st_pctl_remove(struct platform_device *pdev) +{ + struct st_pinctrl *info = platform_get_drvdata(pdev); + struct device_node *np = pdev->dev.of_node; + struct device_node *child; + struct gpio_chip gpio_chip; + int bank = 0; + + if (info->nbanks) { + for_each_child_of_node(np, child) { + if (of_property_read_bool(child, "gpio-controller")) { + gpio_chip = info->banks[bank].gpio_chip; + gpiochip_remove(&gpio_chip); + bank++; + } + } + } + + pinctrl_unregister(info->pctl); + + return 0; +} + static struct platform_driver st_pctl_driver = { .driver = { .name = "st-pinctrl",
@@ -1692,6 +1716,7 @@ static struct platform_driver st_pctl_driver = { .of_match_table = st_pctl_of_match, }, .probe = st_pctl_probe, + .remove = st_pctl_remove, }; static int __init st_pctl_init(void)
--
1.7.0.4