[10/42] drivers: gpio: ep93xx: devm_platform_ioremap_resource()

Commit Message

Enrico Weigelt, metux IT consult March 11, 2019, 6:54 p.m. UTC

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 <[e-mail]>
---
 drivers/gpio/gpio-ep93xx.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Thierry Reding March 12, 2019, 11:23 a.m. UTC | #1

On Mon, Mar 11, 2019 at 07:54:49PM +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 <[e-mail]>
> ---
>  drivers/gpio/gpio-ep93xx.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
> index 71728d6..52e9a7b2 100644
> --- a/drivers/gpio/gpio-ep93xx.c
> +++ b/drivers/gpio/gpio-ep93xx.c
> @@ -393,16 +393,13 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc, struct device *dev,
>  static int ep93xx_gpio_probe(struct platform_device *pdev)
>  {
>  	struct ep93xx_gpio *epg;
> -	struct resource *res;
>  	int i;
> -	struct device *dev = &pdev->dev;
>  
> -	epg = devm_kzalloc(dev, sizeof(*epg), GFP_KERNEL);
> +	epg = devm_kzalloc(&odev->dev, sizeof(*epg), GFP_KERNEL);

odev -> pdev

You should write some scripts to compile-test these changes. Compilers
are good at catching these silly typos. Humans not so much.

Thierry

Linus Walleij April 3, 2019, 2:27 a.m. UTC | #2

On Tue, Mar 12, 2019 at 1:55 AM Enrico Weigelt, metux IT consult
<[e-mail]> 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 <[e-mail]>

Skipping this patch for now because of the bug pointed out by Thierry,
BTW rebase on my GPIO "devel" branch after I applied the
uncontroversial patches (most of them are obviously correct).

I know it is not super easy to build all of those systems so cold
coding is fine with me, I will find any remaining bugs for sure. :D

Yours,
Linus Walleij

Patch

diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index 71728d6..52e9a7b2 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -393,16 +393,13 @@  static int ep93xx_gpio_add_bank(struct gpio_chip *gc, struct device *dev,
 static int ep93xx_gpio_probe(struct platform_device *pdev)
 {
 	struct ep93xx_gpio *epg;
-	struct resource *res;
 	int i;
-	struct device *dev = &pdev->dev;
 
-	epg = devm_kzalloc(dev, sizeof(*epg), GFP_KERNEL);
+	epg = devm_kzalloc(&odev->dev, sizeof(*epg), GFP_KERNEL);
 	if (!epg)
 		return -ENOMEM;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	epg->base = devm_ioremap_resource(dev, res);
+	epg->base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(epg->base))
 		return PTR_ERR(epg->base);