From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
linux-clk <linux-clk@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH 2/2] clk: renesas: Avoid mixing error pointers and NULL
Date: Fri, 18 Jun 2021 13:21:13 +0200 [thread overview]
Message-ID: <CAMuHMdWw99xv6=HtKFN4mJy_to5xOO-659dc_owR3+mmt8zjMA@mail.gmail.com> (raw)
In-Reply-To: <YMtY7nOtqEvTokh7@mwanda>
Hi Dan,
On Thu, Jun 17, 2021 at 4:15 PM Dan Carpenter <dan.carpenter@oracle.com> 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@oracle.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
> @@ -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@linux.alibaba.com
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
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
next prev parent reply other threads:[~2021-06-18 11:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 14:14 [PATCH v2 1/2] clk: renesas: fix a double free on error Dan Carpenter
2021-06-17 14:15 ` [PATCH 2/2] clk: renesas: Avoid mixing error pointers and NULL Dan Carpenter
2021-06-17 14:40 ` Prabhakar Mahadev Lad
2021-06-18 11:21 ` Geert Uytterhoeven [this message]
2021-06-17 14:23 ` [PATCH v2 1/2] clk: renesas: fix a double free on error Prabhakar Mahadev Lad
2021-06-17 14:48 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMuHMdWw99xv6=HtKFN4mJy_to5xOO-659dc_owR3+mmt8zjMA@mail.gmail.com' \
--to=geert@linux-m68k.org \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=sboyd@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).