[PATCH v3] gpio: sifive: Add missing check for platform_get_irq

Jiasheng Jiang posted 1 patch 2 years, 8 months ago
There is a newer version of this series
drivers/gpio/gpio-sifive.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
[PATCH v3] gpio: sifive: Add missing check for platform_get_irq
Posted by Jiasheng Jiang 2 years, 8 months ago
Add the missing check for platform_get_irq() and return error code
if it fails.

Fixes: f52d6d8b43e5 ("gpio: sifive: To get gpio irq offset from device tree data")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
Changelog:

v2 -> v3:

1. Check before assigning values.

v1 -> v2:

1. Return "girq->parents[0]" instead of "-ENODEV".
---
 drivers/gpio/gpio-sifive.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
index 98939cd4a71e..745e5f67254e 100644
--- a/drivers/gpio/gpio-sifive.c
+++ b/drivers/gpio/gpio-sifive.c
@@ -221,8 +221,12 @@ static int sifive_gpio_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	for (i = 0; i < ngpio; i++)
-		chip->irq_number[i] = platform_get_irq(pdev, i);
+	for (i = 0; i < ngpio; i++) {
+		ret = platform_get_irq(pdev, i);
+		if (ret < 0)
+			return ret;
+		chip->irq_number[i] = ret;
+	}
 
 	ret = bgpio_init(&chip->gc, dev, 4,
 			 chip->base + SIFIVE_GPIO_INPUT_VAL,
-- 
2.25.1
Re: [PATCH v3] gpio: sifive: Add missing check for platform_get_irq
Posted by Andy Shevchenko 2 years, 8 months ago
On Mon, Jun 5, 2023 at 4:49 AM Jiasheng Jiang <jiasheng@iscas.ac.cn> wrote:
>
> Add the missing check for platform_get_irq() and return error code
> if it fails.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Fixes: f52d6d8b43e5 ("gpio: sifive: To get gpio irq offset from device tree data")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> Changelog:
>
> v2 -> v3:
>
> 1. Check before assigning values.
>
> v1 -> v2:
>
> 1. Return "girq->parents[0]" instead of "-ENODEV".
> ---
>  drivers/gpio/gpio-sifive.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
> index 98939cd4a71e..745e5f67254e 100644
> --- a/drivers/gpio/gpio-sifive.c
> +++ b/drivers/gpio/gpio-sifive.c
> @@ -221,8 +221,12 @@ static int sifive_gpio_probe(struct platform_device *pdev)
>                 return -ENODEV;
>         }
>
> -       for (i = 0; i < ngpio; i++)
> -               chip->irq_number[i] = platform_get_irq(pdev, i);
> +       for (i = 0; i < ngpio; i++) {
> +               ret = platform_get_irq(pdev, i);
> +               if (ret < 0)
> +                       return ret;
> +               chip->irq_number[i] = ret;
> +       }
>
>         ret = bgpio_init(&chip->gc, dev, 4,
>                          chip->base + SIFIVE_GPIO_INPUT_VAL,
> --
> 2.25.1
>


-- 
With Best Regards,
Andy Shevchenko
Re: [PATCH v3] gpio: sifive: Add missing check for platform_get_irq
Posted by Andy Shevchenko 2 years, 8 months ago
On Mon, Jun 5, 2023 at 12:13 PM Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
>
> On Mon, Jun 5, 2023 at 4:49 AM Jiasheng Jiang <jiasheng@iscas.ac.cn> wrote:
> >
> > Add the missing check for platform_get_irq() and return error code
> > if it fails.
>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Actually, the change is functional and now the wrong IRQ numbering in
the DT will fail the ->probe(). This needs an additional explanation
in the commit message why it's not a problem.

> > -       for (i = 0; i < ngpio; i++)
> > -               chip->irq_number[i] = platform_get_irq(pdev, i);
> > +       for (i = 0; i < ngpio; i++) {
> > +               ret = platform_get_irq(pdev, i);
> > +               if (ret < 0)
> > +                       return ret;
> > +               chip->irq_number[i] = ret;
> > +       }

-- 
With Best Regards,
Andy Shevchenko