| Message ID | 1552330521-4276-12-git-send-email-info@metux.net |
|---|---|
| State | New |
| Headers | show |
| Series | [01/42] drivers: gpio: 74xx-mmio: use devm_platform_ioremap_resource() | expand |
On Mon, Mar 11, 2019 at 07:54:51PM +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-grgpio.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c > index 45b8d6a..09d3dac 100644 > --- a/drivers/gpio/gpio-grgpio.c > +++ b/drivers/gpio/gpio-grgpio.c > @@ -333,7 +333,6 @@ static int grgpio_probe(struct platform_device *ofdev) > void __iomem *regs; > struct gpio_chip *gc; > struct grgpio_priv *priv; > - struct resource *res; > int err; > u32 prop; > s32 *irqmap; > @@ -344,8 +343,7 @@ static int grgpio_probe(struct platform_device *ofdev) > if (!priv) > return -ENOMEM; > > - res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); > - regs = devm_ioremap_resource(&ofdev->dev, res); > + regs = devm_platform_ioremap_resource(&ofdev, 0); Drop the &? Thierry
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> Holding this one back so you can fix the bug pointed out by Thierry. Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index 45b8d6a..09d3dac 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -333,7 +333,6 @@ static int grgpio_probe(struct platform_device *ofdev) void __iomem *regs; struct gpio_chip *gc; struct grgpio_priv *priv; - struct resource *res; int err; u32 prop; s32 *irqmap; @@ -344,8 +343,7 @@ static int grgpio_probe(struct platform_device *ofdev) if (!priv) return -ENOMEM; - res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); - regs = devm_ioremap_resource(&ofdev->dev, res); + regs = devm_platform_ioremap_resource(&ofdev, 0); if (IS_ERR(regs)) return PTR_ERR(regs);
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-grgpio.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)