| Message ID | 20191002170249.17366-4-brgl@bgdev.pl |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: replace nocache ioremap functions with devm_platform_ioremap_resource() | expand |
CC linux-renesas-soc On Wed, Oct 2, 2019 at 7:03 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > There's no need to use the nocache variant of ioremap(). Switch to > using devm_platform_ioremap_resource(). > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- 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; > struct device *dev = &pdev->dev; > @@ -285,25 +285,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]) { > + if (!irq[0] || !irq[1]) { > dev_err(dev, "missing IRQ or IOMEM\n"); > return -EINVAL; > } > > - p->base0 = devm_ioremap_nocache(dev, io[0]->start, > - resource_size(io[0])); > - if (!p->base0) > - return -ENOMEM; > + p->base0 = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(p->base0)) > + return PTR_ERR(p->base0); > > - p->base1 = devm_ioremap_nocache(dev, io[1]->start, > - resource_size(io[1])); > - if (!p->base1) > - return -ENOMEM; > + p->base1 = devm_platform_ioremap_resource(pdev, 1); > + if (IS_ERR(p->base1)) > + return PTR_ERR(p->base1); > > if (of_property_read_u32(dev->of_node, "ngpios", &ngpios)) { > dev_err(dev, "Missing ngpios OF property\n"); Gr{oetje,eeting}s, Geert
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index 620f25b7efb4..674ebebaf90b 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; struct device *dev = &pdev->dev; @@ -285,25 +285,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]) { + if (!irq[0] || !irq[1]) { dev_err(dev, "missing IRQ or IOMEM\n"); return -EINVAL; } - p->base0 = devm_ioremap_nocache(dev, io[0]->start, - resource_size(io[0])); - if (!p->base0) - return -ENOMEM; + p->base0 = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(p->base0)) + return PTR_ERR(p->base0); - p->base1 = devm_ioremap_nocache(dev, io[1]->start, - resource_size(io[1])); - if (!p->base1) - return -ENOMEM; + p->base1 = devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(p->base1)) + return PTR_ERR(p->base1); if (of_property_read_u32(dev->of_node, "ngpios", &ngpios)) { dev_err(dev, "Missing ngpios OF property\n");