From: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
To: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Zhang Rui <rui.zhang@intel.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Amit Kucheria <amitk@kernel.org>,
linux-renesas-soc@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH] thermal: rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1
Date: Mon, 7 Jun 2021 18:43:59 +0200 [thread overview]
Message-ID: <YL5Mz3F/pHkMmZCS@oden.dyn.berto.se> (raw)
In-Reply-To: <9ea7e65d0331daba96f9a7925cb3d12d2170efb1.1623076804.git.geert+renesas@glider.be>
Hi Geert,
Thanks for your work.
On 2021-06-07 16:41:20 +0200, Geert Uytterhoeven wrote:
> With -Wshadow:
>
> drivers/thermal/rcar_gen3_thermal.c: In function ‘rcar_gen3_thermal_probe’:
> drivers/thermal/rcar_gen3_thermal.c:310:13: warning: declaration of ‘rcar_gen3_ths_tj_1’ shadows a global declaration [-Wshadow]
> 310 | const int *rcar_gen3_ths_tj_1 = of_device_get_match_data(dev);
> | ^~~~~~~~~~~~~~~~~~
> drivers/thermal/rcar_gen3_thermal.c:246:18: note: shadowed declaration is here
> 246 | static const int rcar_gen3_ths_tj_1 = 126;
> | ^~~~~~~~~~~~~~~~~~
>
> To add to the confusion, the local variable has a different type.
>
> Fix the shadowing by renaming the local variable to ths_tj_1.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> ---
> drivers/thermal/rcar_gen3_thermal.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
> index e1e412348076b2ff..42c079ba0d51e4b3 100644
> --- a/drivers/thermal/rcar_gen3_thermal.c
> +++ b/drivers/thermal/rcar_gen3_thermal.c
> @@ -307,7 +307,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev)
> {
> struct rcar_gen3_thermal_priv *priv;
> struct device *dev = &pdev->dev;
> - const int *rcar_gen3_ths_tj_1 = of_device_get_match_data(dev);
> + const int *ths_tj_1 = of_device_get_match_data(dev);
> struct resource *res;
> struct thermal_zone_device *zone;
> int ret, i;
> @@ -352,8 +352,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev)
> priv->tscs[i] = tsc;
>
> priv->thermal_init(tsc);
> - rcar_gen3_thermal_calc_coefs(tsc, ptat, thcodes[i],
> - *rcar_gen3_ths_tj_1);
> + rcar_gen3_thermal_calc_coefs(tsc, ptat, thcodes[i], *ths_tj_1);
>
> zone = devm_thermal_zone_of_sensor_register(dev, i, tsc,
> &rcar_gen3_tz_of_ops);
> --
> 2.25.1
>
--
Regards,
Niklas Söderlund
prev parent reply other threads:[~2021-06-07 16:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 14:41 [PATCH] thermal: rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1 Geert Uytterhoeven
2021-06-07 16:43 ` Niklas Söderlund [this message]
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=YL5Mz3F/pHkMmZCS@oden.dyn.berto.se \
--to=niklas.soderlund@ragnatech.se \
--cc=amitk@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=geert+renesas@glider.be \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=rui.zhang@intel.com \
/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).