Re: [PATCH 2/2] clk: renesas: Avoid mixing error pointers and NULL

[Geert Uytterhoeven]

Hi Dan,

On Thu, Jun 17, 2021 at 4:15 PM Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:
> These functions accidentally return both error pointers and NULL when
> there is an error.  It doesn't cause a problem but it is confusing and
> seems unintentional.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>

Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
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
> @@ -124,7 +124,7 @@ rzg2l_cpg_div_clk_register(const struct cpg_core_clk *core,
>                                                  core->flag, &priv->rmw_lock);
>
>         if (IS_ERR(clk_hw))
> -               return NULL;
> +               return ERR_CAST(clk_hw);
>
>         return clk_hw->clk;
>  }
> @@ -174,17 +174,14 @@ rzg2l_cpg_pll_clk_register(const struct cpg_core_clk *core,
>         struct clk_init_data init;
>         const char *parent_name;
>         struct pll_clk *pll_clk;
> -       struct clk *clk;
>
>         parent = clks[core->parent & 0xffff];
>         if (IS_ERR(parent))
>                 return ERR_CAST(parent);
>
>         pll_clk = devm_kzalloc(dev, sizeof(*pll_clk), GFP_KERNEL);
> -       if (!pll_clk) {
> -               clk = ERR_PTR(-ENOMEM);
> -               return NULL;
> -       }
> +       if (!pll_clk)
> +               return ERR_PTR(-ENOMEM);

This part I already have, by virtue of
https://lore.kernel.org/r/1623896524-102058-1-git-send-email-yang.lee@xxxxxxxxxxxxxxxxx

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

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