From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: linus.walleij@linaro.org, krzk@kernel.org
Cc: tomasz.figa@gmail.com, s.nawrocki@samsung.com,
linux-gpio@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com
Subject: [PATCH v2 4/4] pinctrl: samsung: Use devres version of gpiochip_add_data
Date: Thu, 16 Feb 2017 13:27:16 +0000 [thread overview]
Message-ID: <1487251636-2480-4-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1487251636-2480-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
Use devm_gpiochip_add_data to simplify the error path in
samsung_gpiolib_register. Additionally this would also fix a leak if
the pinctrl driver was unbound, although admittedly I can't see any
good use-case for doing so, but the driver does currently allow it.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
Changes since v1:
- Update commit message.
drivers/pinctrl/samsung/pinctrl-samsung.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index 4ab20ec..eb08f30 100644
--- a/drivers/pinctrl/samsung/pinctrl-samsung.c
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
@@ -934,20 +934,15 @@ static int samsung_gpiolib_register(struct platform_device *pdev,
gc->of_node = bank->of_node;
gc->label = bank->name;
- ret = gpiochip_add_data(gc, bank);
+ ret = devm_gpiochip_add_data(&pdev->dev, gc, bank);
if (ret) {
dev_err(&pdev->dev, "failed to register gpio_chip %s, error code: %d\n",
gc->label, ret);
- goto fail;
+ return ret;
}
}
return 0;
-
-fail:
- for (--i, --bank; i >= 0; --i, --bank)
- gpiochip_remove(&bank->gpio_chip);
- return ret;
}
/* retrieve the soc specific data */
--
2.1.4
next prev parent reply other threads:[~2017-02-16 13:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-16 13:27 [PATCH v2 1/4] pinctrl: Fix trivial spelling typo in a comment Charles Keepax
2017-02-16 13:27 ` [PATCH v2 2/4] pinctrl: samsung: Register pinctrl before GPIO Charles Keepax
2017-02-22 14:37 ` Linus Walleij
2017-02-23 17:23 ` Charles Keepax
2017-02-23 17:54 ` [PATCH] pinctrl: samsung: Calculate GPIO base for pinctrl_add_gpio_range Charles Keepax
2017-02-27 2:13 ` Tomasz Figa
2017-02-28 9:01 ` Charles Keepax
2017-02-28 17:04 ` [PATCH v2] " Charles Keepax
2017-03-04 11:20 ` Tomasz Figa
2017-03-06 16:49 ` Charles Keepax
2017-03-20 18:39 ` Krzysztof Kozlowski
2017-03-21 9:32 ` Charles Keepax
2017-03-14 13:44 ` [PATCH v2 2/4] pinctrl: samsung: Register pinctrl before GPIO Linus Walleij
2017-03-14 13:58 ` Krzysztof Kozlowski
2017-03-16 15:28 ` Linus Walleij
2017-02-16 13:27 ` [PATCH v2 3/4] pinctrl: samsung: Remove unused local variable Charles Keepax
2017-02-22 14:38 ` Linus Walleij
2017-02-16 13:27 ` Charles Keepax [this message]
2017-02-17 13:35 ` [PATCH v2 4/4] pinctrl: samsung: Use devres version of gpiochip_add_data Krzysztof Kozlowski
2017-02-17 13:52 ` Charles Keepax
2017-03-20 18:44 ` Krzysztof Kozlowski
2017-03-23 9:47 ` Linus Walleij
2017-03-23 11:34 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487251636-2480-4-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=krzk@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
--cc=s.nawrocki@samsung.com \
--cc=tomasz.figa@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).