2021-12-03 07:50:00

by Jiasheng Jiang

Subject: [PATCH RESEND] gpio: lpc32xx: Handle devm_gpiochip_add_data error codes

The return value of devm_gpiochip_add_data() is not always 0.
To catch the exception in case of the failure.

Fixes: 69c0a0a52cde ("gpio: lpc32xx: Use devm_gpiochip_add_data() for gpio registration")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
drivers/gpio/gpio-lpc32xx.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 4e626c4235c2..e3b734302b76 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -505,6 +505,7 @@ static int lpc32xx_of_xlate(struct gpio_chip *gc,
static int lpc32xx_gpio_probe(struct platform_device *pdev)
{
int i;
+ int err;
void __iomem *reg_base;

reg_base = devm_platform_ioremap_resource(pdev, 0);
@@ -518,8 +519,10 @@ static int lpc32xx_gpio_probe(struct platform_device *pdev)
lpc32xx_gpiochip[i].chip.of_node = pdev->dev.of_node;
lpc32xx_gpiochip[i].reg_base = reg_base;
}
- devm_gpiochip_add_data(&pdev->dev, &lpc32xx_gpiochip[i].chip,
+ err = devm_gpiochip_add_data(&pdev->dev, &lpc32xx_gpiochip[i].chip,
&lpc32xx_gpiochip[i]);
+ if (err)
+ return err;
}

return 0;
--
2.25.1

2021-12-03 08:05:11

by Vladimir Zapolskiy

Subject: Re: [PATCH RESEND] gpio: lpc32xx: Handle devm_gpiochip_add_data error codes

On 12/3/21 9:49 AM, Jiasheng Jiang wrote:
> The return value of devm_gpiochip_add_data() is not always 0.
> To catch the exception in case of the failure.
>
> Fixes: 69c0a0a52cde ("gpio: lpc32xx: Use devm_gpiochip_add_data() for gpio registration")
> Signed-off-by: Jiasheng Jiang <[email protected]>
> ---
> drivers/gpio/gpio-lpc32xx.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
> index 4e626c4235c2..e3b734302b76 100644
> --- a/drivers/gpio/gpio-lpc32xx.c
> +++ b/drivers/gpio/gpio-lpc32xx.c
> @@ -505,6 +505,7 @@ static int lpc32xx_of_xlate(struct gpio_chip *gc,
> static int lpc32xx_gpio_probe(struct platform_device *pdev)
> {
> int i;
> + int err;

This was missed in v1, so formally it is not a resend, but a v2 change.

> void __iomem *reg_base;
>
> reg_base = devm_platform_ioremap_resource(pdev, 0);
> @@ -518,8 +519,10 @@ static int lpc32xx_gpio_probe(struct platform_device *pdev)
> lpc32xx_gpiochip[i].chip.of_node = pdev->dev.of_node;
> lpc32xx_gpiochip[i].reg_base = reg_base;
> }
> - devm_gpiochip_add_data(&pdev->dev, &lpc32xx_gpiochip[i].chip,
> + err = devm_gpiochip_add_data(&pdev->dev, &lpc32xx_gpiochip[i].chip,
> &lpc32xx_gpiochip[i]);
> + if (err)
> + return err;
> }
>
> return 0;
>

Thank you for the fix.

Acked-by: Vladimir Zapolskiy <[email protected]>

--
Best wishes,
Vladimir