| Message ID | 1623896524-102058-1-git-send-email-yang.lee@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | [-next,v2] clk: renesas: fix return value and unused assignment | expand |
On Thu, Jun 17, 2021 at 4:22 AM Yang Li <yang.lee@linux.alibaba.com> 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 <abaci@linux.alibaba.com> > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> 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
On Thu, Jun 17, 2021 at 9:25 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Thu, Jun 17, 2021 at 4:22 AM Yang Li <yang.lee@linux.alibaba.com> 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 <abaci@linux.alibaba.com> > > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > 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
On Fri, Jun 18, 2021 at 1:19 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Thu, Jun 17, 2021 at 9:25 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > On Thu, Jun 17, 2021 at 4:22 AM Yang Li <yang.lee@linux.alibaba.com> 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 <abaci@linux.alibaba.com> > > > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> > > > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > 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
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);
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 <abaci@linux.alibaba.com> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> --- Change in v2: --simply "return ERR_PTR(-ENOMEM);" drivers/clk/renesas/renesas-rzg2l-cpg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)