| Message ID | 1552330521-4276-5-git-send-email-info@metux.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/42] drivers: gpio: 74xx-mmio: use devm_platform_ioremap_resource() | expand |
On Mon, Mar 11, 2019 at 07:54:44PM +0100, Enrico Weigelt, metux IT consult wrote: > Use the new helper that wraps the calls to platform_get_resource() > and devm_ioremap_resource() together. > > Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> > --- > drivers/gpio/gpio-bcm-kona.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c > index c5536a5..9fa6d3a 100644 > --- a/drivers/gpio/gpio-bcm-kona.c > +++ b/drivers/gpio/gpio-bcm-kona.c > @@ -568,7 +568,6 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > const struct of_device_id *match; > - struct resource *res; > struct bcm_kona_gpio_bank *bank; > struct bcm_kona_gpio *kona_gpio; > struct gpio_chip *chip; > @@ -618,8 +617,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) > return -ENXIO; > } > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - kona_gpio->reg_base = devm_ioremap_resource(dev, res); > + kona_gpio->reg_base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(kona_gpio->reg_base)) { > ret = -ENXIO; This should be ret = PTR_ERR(kona_gpio->reg_base) , shouldn't it? (If yes, this is orthogonal to this patch, but still worth fixing.) @Julia: Is this something that coccinelle could catch? Best regards Uwe
On Tue, Mar 12, 2019 at 1:55 AM Enrico Weigelt, metux IT consult <info@metux.net> wrote: > Use the new helper that wraps the calls to platform_get_resource() > and devm_ioremap_resource() together. > > Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Patch applied with Florian's ACK. Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index c5536a5..9fa6d3a 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c @@ -568,7 +568,6 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; const struct of_device_id *match; - struct resource *res; struct bcm_kona_gpio_bank *bank; struct bcm_kona_gpio *kona_gpio; struct gpio_chip *chip; @@ -618,8 +617,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) return -ENXIO; } - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - kona_gpio->reg_base = devm_ioremap_resource(dev, res); + kona_gpio->reg_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(kona_gpio->reg_base)) { ret = -ENXIO; goto err_irq_domain;
Use the new helper that wraps the calls to platform_get_resource() and devm_ioremap_resource() together. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> --- drivers/gpio/gpio-bcm-kona.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)