From patchwork Sat Aug 30 14:45:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pramod Gurav X-Patchwork-Id: 4813591 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6276FC0338 for ; Sat, 30 Aug 2014 14:50:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 800BF2012D for ; Sat, 30 Aug 2014 14:50:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8395020127 for ; Sat, 30 Aug 2014 14:50:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XNjvQ-0007e7-8g; Sat, 30 Aug 2014 14:46:44 +0000 Received: from smtp89.ord1c.emailsrvr.com ([108.166.43.89]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XNjvN-0007bT-1o for linux-arm-kernel@lists.infradead.org; Sat, 30 Aug 2014 14:46:41 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp12.relay.ord1c.emailsrvr.com (SMTP Server) with ESMTP id A95D28023B; Sat, 30 Aug 2014 10:46:18 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp12.relay.ord1c.emailsrvr.com (Authenticated sender: pramod.gurav-AT-smartplayin.com) with ESMTPSA id C8E7F80639; Sat, 30 Aug 2014 10:46:06 -0400 (EDT) X-Sender-Id: pramod.gurav@smartplayin.com Received: from localhost.localdomain ([UNAVAILABLE]. [106.200.228.155]) (using TLSv1 with cipher DHE-RSA-AES256-SHA) by 0.0.0.0:465 (trex/5.2.10); Sat, 30 Aug 2014 14:46:18 GMT From: Pramod Gurav To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@stlinux.com Subject: [PATCH] pinctrl: st: Add remove function and remove gpio_chip on failure Date: Sat, 30 Aug 2014 20:15:35 +0530 Message-Id: <1409409935-8775-1-git-send-email-pramod.gurav@smartplayin.com> X-Mailer: git-send-email 1.7.0.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140830_074641_195018_16B9F560 X-CRM114-Status: GOOD ( 12.00 ) X-Spam-Score: -0.0 (/) Cc: Pramod Gurav , Srinivas Kandagatla , Linus Walleij , Patrice Chotard , Srinivas Kandagatla , Bjorn Andersson , Maxime Coquelin X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 CC: Srinivas Kandagatla CC: Maxime Coquelin CC: Patrice Chotard CC: Linus Walleij CC: Bjorn Andersson Signed-off-by: Pramod Gurav --- 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)