2021-06-17 02:49:16

by Yang Li

Subject: [PATCH -next v2] clk: renesas: fix return value and unused assignment

Currently the function returns NULL on error, so exact error code is lost.
This patch changes return convention of the function to use ERR_PTR()
on error instead.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Yang Li <[email protected]>
---

Change in v2:
--simply "return ERR_PTR(-ENOMEM);"

drivers/clk/renesas/renesas-rzg2l-cpg.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/clk/renesas/renesas-rzg2l-cpg.c b/drivers/clk/renesas/renesas-rzg2l-cpg.c
index 5009b9e..d46fffd 100644
--- a/drivers/clk/renesas/renesas-rzg2l-cpg.c
+++ b/drivers/clk/renesas/renesas-rzg2l-cpg.c
@@ -182,8 +182,7 @@ static unsigned long rzg2l_cpg_pll_clk_recalc_rate(struct clk_hw *hw,

pll_clk = devm_kzalloc(dev, sizeof(*pll_clk), GFP_KERNEL);
if (!pll_clk) {
- clk = ERR_PTR(-ENOMEM);
- return NULL;
+ return ERR_PTR(-ENOMEM);
}

parent_name = __clk_get_name(parent);
--
1.8.3.1

2021-06-17 07:26:56

by Geert Uytterhoeven

Subject: Re: [PATCH -next v2] clk: renesas: fix return value and unused assignment

On Thu, Jun 17, 2021 at 4:22 AM Yang Li <[email protected]> wrote:
> Currently the function returns NULL on error, so exact error code is lost.
> This patch changes return convention of the function to use ERR_PTR()
> on error instead.
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Yang Li <[email protected]>

Reviewed-by: Geert Uytterhoeven <[email protected]>
i.e. will queue in renesas-clk-for-v5.15.

> --- a/drivers/clk/renesas/renesas-rzg2l-cpg.c
> +++ b/drivers/clk/renesas/renesas-rzg2l-cpg.c
> @@ -182,8 +182,7 @@ static unsigned long rzg2l_cpg_pll_clk_recalc_rate(struct clk_hw *hw,
>
> pll_clk = devm_kzalloc(dev, sizeof(*pll_clk), GFP_KERNEL);
> if (!pll_clk) {
> - clk = ERR_PTR(-ENOMEM);
> - return NULL;
> + return ERR_PTR(-ENOMEM);
> }

I'll drop the curly braces while applying.

>
> parent_name = __clk_get_name(parent);

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2021-06-18 12:41:19

by Geert Uytterhoeven

Subject: Re: [PATCH -next v2] clk: renesas: fix return value and unused assignment

On Thu, Jun 17, 2021 at 9:25 AM Geert Uytterhoeven <[email protected]> wrote:
> On Thu, Jun 17, 2021 at 4:22 AM Yang Li <[email protected]> wrote:
> > Currently the function returns NULL on error, so exact error code is lost.
> > This patch changes return convention of the function to use ERR_PTR()
> > on error instead.
> >
> > Reported-by: Abaci Robot <[email protected]>
> > Signed-off-by: Yang Li <[email protected]>
>
> Reviewed-by: Geert Uytterhoeven <[email protected]>
> i.e. will queue in renesas-clk-for-v5.15.
>
> > --- a/drivers/clk/renesas/renesas-rzg2l-cpg.c
> > +++ b/drivers/clk/renesas/renesas-rzg2l-cpg.c
> > @@ -182,8 +182,7 @@ static unsigned long rzg2l_cpg_pll_clk_recalc_rate(struct clk_hw *hw,
> >
> > pll_clk = devm_kzalloc(dev, sizeof(*pll_clk), GFP_KERNEL);
> > if (!pll_clk) {
> > - clk = ERR_PTR(-ENOMEM);
> > - return NULL;
> > + return ERR_PTR(-ENOMEM);
> > }
>
> I'll drop the curly braces while applying.

... and the now unused clk variable.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2021-06-18 16:04:22

by Geert Uytterhoeven

Subject: Re: [PATCH -next v2] clk: renesas: fix return value and unused assignment

On Fri, Jun 18, 2021 at 1:19 PM Geert Uytterhoeven <[email protected]> wrote:
> On Thu, Jun 17, 2021 at 9:25 AM Geert Uytterhoeven <[email protected]> wrote:
> > On Thu, Jun 17, 2021 at 4:22 AM Yang Li <[email protected]> wrote:
> > > Currently the function returns NULL on error, so exact error code is lost.
> > > This patch changes return convention of the function to use ERR_PTR()
> > > on error instead.
> > >
> > > Reported-by: Abaci Robot <[email protected]>
> > > Signed-off-by: Yang Li <[email protected]>
> >
> > Reviewed-by: Geert Uytterhoeven <[email protected]>
> > i.e. will queue in renesas-clk-for-v5.15.
> >
> > > --- a/drivers/clk/renesas/renesas-rzg2l-cpg.c
> > > +++ b/drivers/clk/renesas/renesas-rzg2l-cpg.c
> > > @@ -182,8 +182,7 @@ static unsigned long rzg2l_cpg_pll_clk_recalc_rate(struct clk_hw *hw,
> > >
> > > pll_clk = devm_kzalloc(dev, sizeof(*pll_clk), GFP_KERNEL);
> > > if (!pll_clk) {
> > > - clk = ERR_PTR(-ENOMEM);
> > > - return NULL;
> > > + return ERR_PTR(-ENOMEM);
> > > }
> >
> > I'll drop the curly braces while applying.
>
> ... and the now unused clk variable.

Oops, that's only after Dan's patch. Reshuffling...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds