From: "Enrico Weigelt, metux IT consult" <info@metux.net>
To: linux-kernel@vger.kernel.org
Cc: linus.walleij@linaro.org, bgolaszewski@baylibre.com,
orsonzhai@gmail.com, baolin.wang@linaro.org,
zhang.lyra@gmail.com, linux-gpio@vger.kernel.org
Subject: [PATCH 7/7] drivers: gpio: vr41xx: use devm_platform_ioremap_resource()
Date: Mon, 17 Jun 2019 18:49:20 +0200 [thread overview]
Message-ID: <1560790160-3372-7-git-send-email-info@metux.net> (raw)
In-Reply-To: <1560790160-3372-1-git-send-email-info@metux.net>
Use the new helper that wraps the calls to platform_get_resource()
and devm_ioremap_resource() together.
this driver deserves a bit more cleanup, to get rid of the global
variable giu_base, which makes it single-instance-only.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
drivers/gpio/gpio-vr41xx.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index b13a49c..98cd715 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -467,10 +467,9 @@ static int vr41xx_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
static int giu_probe(struct platform_device *pdev)
{
- struct resource *res;
unsigned int trigger, i, pin;
struct irq_chip *chip;
- int irq, ret;
+ int irq;
switch (pdev->id) {
case GPIO_50PINS_PULLUPDOWN:
@@ -489,21 +488,14 @@ static int giu_probe(struct platform_device *pdev)
return -ENODEV;
}
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- return -EBUSY;
-
- giu_base = ioremap(res->start, resource_size(res));
- if (!giu_base)
- return -ENOMEM;
+ giu_base = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(giu_base))
+ return PTR_ERR(giu_base);
vr41xx_gpio_chip.parent = &pdev->dev;
- ret = gpiochip_add_data(&vr41xx_gpio_chip, NULL);
- if (!ret) {
- iounmap(giu_base);
+ if (gpiochip_add_data(&vr41xx_gpio_chip, NULL))
return -ENODEV;
- }
giu_write(GIUINTENL, 0);
giu_write(GIUINTENH, 0);
@@ -534,7 +526,6 @@ static int giu_probe(struct platform_device *pdev)
static int giu_remove(struct platform_device *pdev)
{
if (giu_base) {
- iounmap(giu_base);
giu_base = NULL;
}
--
1.9.1
next prev parent reply other threads:[~2019-06-17 16:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 16:49 [PATCH 1/7] drivers: gpio: rcar: pedantic formatting Enrico Weigelt, metux IT consult
2019-06-17 16:49 ` [PATCH 2/7] drivers: gpio: amdpt: drop unneeded deref of &pdev->dev Enrico Weigelt, metux IT consult
2019-06-25 9:05 ` Linus Walleij
2019-06-17 16:49 ` [PATCH 3/7] drivers: gpio: eic-sprd: use devm_platform_ioremap_resource() Enrico Weigelt, metux IT consult
2019-06-19 11:34 ` Baolin Wang
2019-06-25 9:12 ` Linus Walleij
2019-06-17 16:49 ` [PATCH 4/7] drivers: gpio: ep93xx: devm_platform_ioremap_resource() Enrico Weigelt, metux IT consult
2019-06-25 9:06 ` Linus Walleij
2019-06-17 16:49 ` [PATCH 5/7] drivers: gpio: grgpio: use devm_platform_ioremap_resource() Enrico Weigelt, metux IT consult
2019-06-25 9:07 ` Linus Walleij
2019-06-17 16:49 ` [PATCH 6/7] drivers: gpio: janz-ttl: drop unneccessary temp variable dev Enrico Weigelt, metux IT consult
2019-06-25 9:08 ` Linus Walleij
2019-06-17 16:49 ` Enrico Weigelt, metux IT consult [this message]
2019-06-25 9:10 ` [PATCH 7/7] drivers: gpio: vr41xx: use devm_platform_ioremap_resource() Linus Walleij
2019-06-25 9:04 ` [PATCH 1/7] drivers: gpio: rcar: pedantic formatting Linus Walleij
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=1560790160-3372-7-git-send-email-info@metux.net \
--to=info@metux.net \
--cc=baolin.wang@linaro.org \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=orsonzhai@gmail.com \
--cc=zhang.lyra@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).