From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Jonathan Corbet <corbet@lwn.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Alban Bedel <albeu@free.fr>,
Linus Walleij <linus.walleij@linaro.org>,
Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert+renesas@glider.be>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-gpio@vger.kernel.org, Julia Lawall <Julia.Lawall@lip6.fr>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 5/9] gpio: em: use devm_platform_ioremap_resource_nocache()
Date: Thu, 29 Aug 2019 16:37:38 +0200 [thread overview]
Message-ID: <20190829143742.24726-6-brgl@bgdev.pl> (raw)
In-Reply-To: <20190829143742.24726-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Use the new devm_platform_ioremap_resource_nocache() helper for memory
range mapping instead of devm_ioremap_nocache() combined with a call to
platform_get_resource().
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/gpio/gpio-em.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index a87951293aaa..0f4f5e11278a 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -269,7 +269,7 @@ static void em_gio_irq_domain_remove(void *data)
static int em_gio_probe(struct platform_device *pdev)
{
struct em_gio_priv *p;
- struct resource *io[2], *irq[2];
+ struct resource *irq[2];
struct gpio_chip *gpio_chip;
struct irq_chip *irq_chip;
const char *name = dev_name(&pdev->dev);
@@ -284,25 +284,21 @@ static int em_gio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, p);
spin_lock_init(&p->sense_lock);
- io[0] = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- io[1] = platform_get_resource(pdev, IORESOURCE_MEM, 1);
irq[0] = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
irq[1] = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
- if (!io[0] || !io[1] || !irq[0] || !irq[1]) {
- dev_err(&pdev->dev, "missing IRQ or IOMEM\n");
+ if (!irq[0] || !irq[1]) {
+ dev_err(&pdev->dev, "missing IRQ resources\n");
return -EINVAL;
}
- p->base0 = devm_ioremap_nocache(&pdev->dev, io[0]->start,
- resource_size(io[0]));
- if (!p->base0)
- return -ENOMEM;
+ p->base0 = devm_platform_ioremap_resource_nocache(pdev, 0);
+ if (IS_ERR(p->base0))
+ return PTR_ERR(p->base0);
- p->base1 = devm_ioremap_nocache(&pdev->dev, io[1]->start,
- resource_size(io[1]));
- if (!p->base1)
- return -ENOMEM;
+ p->base1 = devm_platform_ioremap_resource_nocache(pdev, 1);
+ if (IS_ERR(p->base1))
+ return PTR_ERR(p->base1);
if (of_property_read_u32(pdev->dev.of_node, "ngpios", &ngpios)) {
dev_err(&pdev->dev, "Missing ngpios OF property\n");
--
2.21.0
next prev parent reply other threads:[~2019-08-29 14:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 14:37 [PATCH 0/9] drivers: add new variants of devm_platform_ioremap_resource() Bartosz Golaszewski
2019-08-29 14:37 ` [PATCH 1/9] Documentation: devres: add missing entry for devm_platform_ioremap_resource() Bartosz Golaszewski
2019-08-29 14:37 ` [PATCH 2/9] lib: devres: prepare devm_ioremap_resource() for more variants Bartosz Golaszewski
2019-08-29 14:37 ` [PATCH 3/9] lib: devres: provide new variants for devm_ioremap_resource() Bartosz Golaszewski
2019-08-29 15:09 ` Arnd Bergmann
2019-08-29 14:37 ` [PATCH 4/9] drivers: provide new variants of devm_platform_ioremap_resource() Bartosz Golaszewski
2019-08-29 14:37 ` Bartosz Golaszewski [this message]
2019-08-29 14:37 ` [PATCH 6/9] gpio: ath79: use devm_platform_ioremap_resource_nocache() Bartosz Golaszewski
2019-08-29 14:37 ` [PATCH 7/9] gpio: htc-egpio: " Bartosz Golaszewski
2019-08-29 14:37 ` [PATCH 8/9] gpio: xgene: " Bartosz Golaszewski
2019-08-29 14:37 ` [PATCH 9/9] misc: sram: use devm_platform_ioremap_resource_wc() Bartosz Golaszewski
2019-08-29 14:48 ` [PATCH 0/9] drivers: add new variants of devm_platform_ioremap_resource() Geert Uytterhoeven
2019-08-30 15:59 ` Christoph Hellwig
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=20190829143742.24726-6-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=Julia.Lawall@lip6.fr \
--cc=albeu@free.fr \
--cc=arnd@arndb.de \
--cc=bgolaszewski@baylibre.com \
--cc=corbet@lwn.net \
--cc=geert+renesas@glider.be \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
/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).