diff mbox series

[2/2] gpio: mt7621: pass mediatek_gpio_bank_probe() failure up the stack

Message ID 1542823573-20228-2-git-send-email-hofrat@osadl.org (mailing list archive)
State New, archived
Headers show
Series [1/2] gpio: mt7621: report failure of devm_kasprintf() | expand

Commit Message

Nicholas Mc Guire Nov. 21, 2018, 6:06 p.m. UTC
The error cases of mediatek_gpio_bank_probe() would go unnoticed (except
for the dev_err() messages). The probe function should return an error
if one of the banks failed to initialize properly.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: 4ba9c3afda41 ("gpio: mt7621: Add a driver for MT7621")
---

Patch was compile tested with: omega2p_defconfig, SOC_MT7621=y,
GPIOLIB=y, GPIO_MT7621=y

Patch is against 4.20-rc3 (localversion-next is next-20181121)

 drivers/gpio/gpio-mt7621.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Bartosz Golaszewski Nov. 22, 2018, 4:44 p.m. UTC | #1
śr., 21 lis 2018 o 19:13 Nicholas Mc Guire <hofrat@osadl.org> napisał(a):
>
> The error cases of mediatek_gpio_bank_probe() would go unnoticed (except
> for the dev_err() messages). The probe function should return an error
> if one of the banks failed to initialize properly.
>
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
> Fixes: 4ba9c3afda41 ("gpio: mt7621: Add a driver for MT7621")
> ---
>
> Patch was compile tested with: omega2p_defconfig, SOC_MT7621=y,
> GPIOLIB=y, GPIO_MT7621=y
>
> Patch is against 4.20-rc3 (localversion-next is next-20181121)
>
>  drivers/gpio/gpio-mt7621.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
> index 1ec95bc..68fca8b 100644
> --- a/drivers/gpio/gpio-mt7621.c
> +++ b/drivers/gpio/gpio-mt7621.c
> @@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)
>         struct device_node *np = dev->of_node;
>         struct mtk *mtk;
>         int i;
> +       int ret;
>
>         mtk = devm_kzalloc(dev, sizeof(*mtk), GFP_KERNEL);
>         if (!mtk)
> @@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)
>         platform_set_drvdata(pdev, mtk);
>         mediatek_gpio_irq_chip.name = dev_name(dev);
>
> -       for (i = 0; i < MTK_BANK_CNT; i++)
> -               mediatek_gpio_bank_probe(dev, np, i);
> +       for (i = 0; i < MTK_BANK_CNT; i++) {
> +               ret = mediatek_gpio_bank_probe(dev, np, i);
> +               if (!ret)
> +                       return ret;
> +       }

Looks like are resources allocated in mediatek_gpio_bank_probe() will
be freed automatically so:

Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Sean Wang Nov. 27, 2018, 7:49 a.m. UTC | #2
Nicholas Mc Guire <hofrat@osadl.org> 於 2018年11月21日 週三 上午10:13寫道:
>
> The error cases of mediatek_gpio_bank_probe() would go unnoticed (except
> for the dev_err() messages). The probe function should return an error
> if one of the banks failed to initialize properly.
>
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
> Fixes: 4ba9c3afda41 ("gpio: mt7621: Add a driver for MT7621")
> ---
>
> Patch was compile tested with: omega2p_defconfig, SOC_MT7621=y,
> GPIOLIB=y, GPIO_MT7621=y
>
> Patch is against 4.20-rc3 (localversion-next is next-20181121)
>
>  drivers/gpio/gpio-mt7621.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
> index 1ec95bc..68fca8b 100644
> --- a/drivers/gpio/gpio-mt7621.c
> +++ b/drivers/gpio/gpio-mt7621.c
> @@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)
>         struct device_node *np = dev->of_node;
>         struct mtk *mtk;
>         int i;
> +       int ret;
>
>         mtk = devm_kzalloc(dev, sizeof(*mtk), GFP_KERNEL);
>         if (!mtk)
> @@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)
>         platform_set_drvdata(pdev, mtk);
>         mediatek_gpio_irq_chip.name = dev_name(dev);
>
> -       for (i = 0; i < MTK_BANK_CNT; i++)
> -               mediatek_gpio_bank_probe(dev, np, i);
> +       for (i = 0; i < MTK_BANK_CNT; i++) {
> +               ret = mediatek_gpio_bank_probe(dev, np, i);
> +               if (!ret)

it should be if (ret < 0) ?

> +                       return ret;
> +       }
>
>         return 0;
>  }
> --
> 2.1.4
>
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
Nicholas Mc Guire Nov. 27, 2018, 8:01 a.m. UTC | #3
On Mon, Nov 26, 2018 at 11:49:26PM -0800, Sean Wang wrote:
> Nicholas Mc Guire <hofrat@osadl.org> ??? 2018???11???21??? ?????? ??????10:13?????????
> >
> > The error cases of mediatek_gpio_bank_probe() would go unnoticed (except
> > for the dev_err() messages). The probe function should return an error
> > if one of the banks failed to initialize properly.
> >
> > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
> > Fixes: 4ba9c3afda41 ("gpio: mt7621: Add a driver for MT7621")
> > ---
> >
> > Patch was compile tested with: omega2p_defconfig, SOC_MT7621=y,
> > GPIOLIB=y, GPIO_MT7621=y
> >
> > Patch is against 4.20-rc3 (localversion-next is next-20181121)
> >
> >  drivers/gpio/gpio-mt7621.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
> > index 1ec95bc..68fca8b 100644
> > --- a/drivers/gpio/gpio-mt7621.c
> > +++ b/drivers/gpio/gpio-mt7621.c
> > @@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)
> >         struct device_node *np = dev->of_node;
> >         struct mtk *mtk;
> >         int i;
> > +       int ret;
> >
> >         mtk = devm_kzalloc(dev, sizeof(*mtk), GFP_KERNEL);
> >         if (!mtk)
> > @@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)
> >         platform_set_drvdata(pdev, mtk);
> >         mediatek_gpio_irq_chip.name = dev_name(dev);
> >
> > -       for (i = 0; i < MTK_BANK_CNT; i++)
> > -               mediatek_gpio_bank_probe(dev, np, i);
> > +       for (i = 0; i < MTK_BANK_CNT; i++) {
> > +               ret = mediatek_gpio_bank_probe(dev, np, i);
> > +               if (!ret)
> 
> it should be if (ret < 0) ?

I don´t think so mediatek_gpio_bank_probe() returns 0 on success
and all other returns are error paths - while the current code
only returns negative values I do thik that any non 0 would be
an error indication so !ret should be fine here.

thx!
hofrat

> 
> > +                       return ret;
> > +       }
> >
> >         return 0;
> >  }
> > --
> > 2.1.4
> >
> >
> > _______________________________________________
> > Linux-mediatek mailing list
> > Linux-mediatek@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-mediatek
Sean Wang Nov. 27, 2018, 8:32 a.m. UTC | #4
>
> On Mon, Nov 26, 2018 at 11:49:26PM -0800, Sean Wang wrote:
> > Nicholas Mc Guire <hofrat@osadl.org> ??? 2018???11???21??? ?????? ??????10:13?????????
> > >
> > > The error cases of mediatek_gpio_bank_probe() would go unnoticed (except
> > > for the dev_err() messages). The probe function should return an error
> > > if one of the banks failed to initialize properly.
> > >
> > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
> > > Fixes: 4ba9c3afda41 ("gpio: mt7621: Add a driver for MT7621")
> > > ---
> > >
> > > Patch was compile tested with: omega2p_defconfig, SOC_MT7621=y,
> > > GPIOLIB=y, GPIO_MT7621=y
> > >
> > > Patch is against 4.20-rc3 (localversion-next is next-20181121)
> > >
> > >  drivers/gpio/gpio-mt7621.c | 8 ++++++--
> > >  1 file changed, 6 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
> > > index 1ec95bc..68fca8b 100644
> > > --- a/drivers/gpio/gpio-mt7621.c
> > > +++ b/drivers/gpio/gpio-mt7621.c
> > > @@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)
> > >         struct device_node *np = dev->of_node;
> > >         struct mtk *mtk;
> > >         int i;
> > > +       int ret;
> > >
> > >         mtk = devm_kzalloc(dev, sizeof(*mtk), GFP_KERNEL);
> > >         if (!mtk)
> > > @@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)
> > >         platform_set_drvdata(pdev, mtk);
> > >         mediatek_gpio_irq_chip.name = dev_name(dev);
> > >
> > > -       for (i = 0; i < MTK_BANK_CNT; i++)
> > > -               mediatek_gpio_bank_probe(dev, np, i);
> > > +       for (i = 0; i < MTK_BANK_CNT; i++) {
> > > +               ret = mediatek_gpio_bank_probe(dev, np, i);
> > > +               if (!ret)
> >
> > it should be if (ret < 0) ?
>
> I don´t think so mediatek_gpio_bank_probe() returns 0 on success
> and all other returns are error paths - while the current code
> only returns negative values I do thik that any non 0 would be
> an error indication so !ret should be fine here.
>
!0 would be true

> thx!
> hofrat
>
> >
> > > +                       return ret;
> > > +       }
> > >
> > >         return 0;
> > >  }
> > > --
> > > 2.1.4
> > >
> > >
> > > _______________________________________________
> > > Linux-mediatek mailing list
> > > Linux-mediatek@lists.infradead.org
> > > http://lists.infradead.org/mailman/listinfo/linux-mediatek
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
Nicholas Mc Guire Nov. 27, 2018, 8:37 a.m. UTC | #5
On Tue, Nov 27, 2018 at 12:32:59AM -0800, Sean Wang wrote:
> >
> > On Mon, Nov 26, 2018 at 11:49:26PM -0800, Sean Wang wrote:
> > > Nicholas Mc Guire <hofrat@osadl.org> ??? 2018???11???21??? ?????? ??????10:13?????????
> > > >
> > > > The error cases of mediatek_gpio_bank_probe() would go unnoticed (except
> > > > for the dev_err() messages). The probe function should return an error
> > > > if one of the banks failed to initialize properly.
> > > >
> > > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
> > > > Fixes: 4ba9c3afda41 ("gpio: mt7621: Add a driver for MT7621")
> > > > ---
> > > >
> > > > Patch was compile tested with: omega2p_defconfig, SOC_MT7621=y,
> > > > GPIOLIB=y, GPIO_MT7621=y
> > > >
> > > > Patch is against 4.20-rc3 (localversion-next is next-20181121)
> > > >
> > > >  drivers/gpio/gpio-mt7621.c | 8 ++++++--
> > > >  1 file changed, 6 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
> > > > index 1ec95bc..68fca8b 100644
> > > > --- a/drivers/gpio/gpio-mt7621.c
> > > > +++ b/drivers/gpio/gpio-mt7621.c
> > > > @@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)
> > > >         struct device_node *np = dev->of_node;
> > > >         struct mtk *mtk;
> > > >         int i;
> > > > +       int ret;
> > > >
> > > >         mtk = devm_kzalloc(dev, sizeof(*mtk), GFP_KERNEL);
> > > >         if (!mtk)
> > > > @@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)
> > > >         platform_set_drvdata(pdev, mtk);
> > > >         mediatek_gpio_irq_chip.name = dev_name(dev);
> > > >
> > > > -       for (i = 0; i < MTK_BANK_CNT; i++)
> > > > -               mediatek_gpio_bank_probe(dev, np, i);
> > > > +       for (i = 0; i < MTK_BANK_CNT; i++) {
> > > > +               ret = mediatek_gpio_bank_probe(dev, np, i);
> > > > +               if (!ret)
> > >
> > > it should be if (ret < 0) ?
> >
> > I don´t think so mediatek_gpio_bank_probe() returns 0 on success
> > and all other returns are error paths - while the current code
> > only returns negative values I do thik that any non 0 would be
> > an error indication so !ret should be fine here.
> >
> !0 would be true
>
...sorry - stupid me - thanks for catching that !

thx!
hofrat
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
index 1ec95bc..68fca8b 100644
--- a/drivers/gpio/gpio-mt7621.c
+++ b/drivers/gpio/gpio-mt7621.c
@@ -297,6 +297,7 @@  mediatek_gpio_probe(struct platform_device *pdev)
 	struct device_node *np = dev->of_node;
 	struct mtk *mtk;
 	int i;
+	int ret;
 
 	mtk = devm_kzalloc(dev, sizeof(*mtk), GFP_KERNEL);
 	if (!mtk)
@@ -311,8 +312,11 @@  mediatek_gpio_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, mtk);
 	mediatek_gpio_irq_chip.name = dev_name(dev);
 
-	for (i = 0; i < MTK_BANK_CNT; i++)
-		mediatek_gpio_bank_probe(dev, np, i);
+	for (i = 0; i < MTK_BANK_CNT; i++) {
+		ret = mediatek_gpio_bank_probe(dev, np, i);
+		if (!ret)
+			return ret;
+	}
 
 	return 0;
 }