All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] gpio: gpio-adp5520: cleanup probe error path + remove platform_set_drvdata()
@ 2021-05-14  8:56 Alexandru Ardelean
  2021-05-21 13:31 ` Bartosz Golaszewski
  0 siblings, 1 reply; 2+ messages in thread
From: Alexandru Ardelean @ 2021-05-14  8:56 UTC (permalink / raw)
  To: linux-gpio, linux-kernel
  Cc: linus.walleij, bgolaszewski, michael.hennerich, Alexandru Ardelean

The platform_set_drvdata() call is only useful if we need to retrieve back
the private information.
Since the driver doesn't do that, it's not useful to have it.

This also means that the 'err' label can be removed and all goto statements
replaced with direct returns (with error codes).

Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
---
 drivers/gpio/gpio-adp5520.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index 0386ede53f3a..c55e821c63b6 100644
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -113,10 +113,8 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
 		if (pdata->gpio_en_mask & (1 << i))
 			dev->lut[gpios++] = 1 << i;
 
-	if (gpios < 1) {
-		ret = -EINVAL;
-		goto err;
-	}
+	if (gpios < 1)
+		return -EINVAL;
 
 	gc = &dev->gpio_chip;
 	gc->direction_input  = adp5520_gpio_direction_input;
@@ -148,18 +146,10 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
 
 	if (ret) {
 		dev_err(&pdev->dev, "failed to write\n");
-		goto err;
+		return ret;
 	}
 
-	ret = devm_gpiochip_add_data(&pdev->dev, &dev->gpio_chip, dev);
-	if (ret)
-		goto err;
-
-	platform_set_drvdata(pdev, dev);
-	return 0;
-
-err:
-	return ret;
+	return devm_gpiochip_add_data(&pdev->dev, &dev->gpio_chip, dev);
 }
 
 static struct platform_driver adp5520_gpio_driver = {
-- 
2.31.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] gpio: gpio-adp5520: cleanup probe error path + remove platform_set_drvdata()
  2021-05-14  8:56 [PATCH] gpio: gpio-adp5520: cleanup probe error path + remove platform_set_drvdata() Alexandru Ardelean
@ 2021-05-21 13:31 ` Bartosz Golaszewski
  0 siblings, 0 replies; 2+ messages in thread
From: Bartosz Golaszewski @ 2021-05-21 13:31 UTC (permalink / raw)
  To: Alexandru Ardelean; +Cc: linux-gpio, LKML, Linus Walleij, Michael Hennerich

On Fri, May 14, 2021 at 10:56 AM Alexandru Ardelean
<aardelean@deviqon.com> wrote:
>
> The platform_set_drvdata() call is only useful if we need to retrieve back
> the private information.
> Since the driver doesn't do that, it's not useful to have it.
>
> This also means that the 'err' label can be removed and all goto statements
> replaced with direct returns (with error codes).
>
> Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
> ---
>  drivers/gpio/gpio-adp5520.c | 18 ++++--------------
>  1 file changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
> index 0386ede53f3a..c55e821c63b6 100644
> --- a/drivers/gpio/gpio-adp5520.c
> +++ b/drivers/gpio/gpio-adp5520.c
> @@ -113,10 +113,8 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
>                 if (pdata->gpio_en_mask & (1 << i))
>                         dev->lut[gpios++] = 1 << i;
>
> -       if (gpios < 1) {
> -               ret = -EINVAL;
> -               goto err;
> -       }
> +       if (gpios < 1)
> +               return -EINVAL;
>
>         gc = &dev->gpio_chip;
>         gc->direction_input  = adp5520_gpio_direction_input;
> @@ -148,18 +146,10 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
>
>         if (ret) {
>                 dev_err(&pdev->dev, "failed to write\n");
> -               goto err;
> +               return ret;
>         }
>
> -       ret = devm_gpiochip_add_data(&pdev->dev, &dev->gpio_chip, dev);
> -       if (ret)
> -               goto err;
> -
> -       platform_set_drvdata(pdev, dev);
> -       return 0;
> -
> -err:
> -       return ret;
> +       return devm_gpiochip_add_data(&pdev->dev, &dev->gpio_chip, dev);
>  }
>
>  static struct platform_driver adp5520_gpio_driver = {
> --
> 2.31.1
>

Applied, thanks!
Bartosz

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-21 13:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-14  8:56 [PATCH] gpio: gpio-adp5520: cleanup probe error path + remove platform_set_drvdata() Alexandru Ardelean
2021-05-21 13:31 ` Bartosz Golaszewski

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.