Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

thermal/drivers/rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1

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>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/9ea7e65d0331daba96f9a7925cb3d12d2170efb1.1623076804.git.geert+renesas@glider.be

authored by

Geert Uytterhoeven and committed by
Daniel Lezcano
3ae5950d 8946187a

+2 -3
+2 -3
drivers/thermal/rcar_gen3_thermal.c
··· 307 307 { 308 308 struct rcar_gen3_thermal_priv *priv; 309 309 struct device *dev = &pdev->dev; 310 - const int *rcar_gen3_ths_tj_1 = of_device_get_match_data(dev); 310 + const int *ths_tj_1 = of_device_get_match_data(dev); 311 311 struct resource *res; 312 312 struct thermal_zone_device *zone; 313 313 int ret, i; ··· 352 352 priv->tscs[i] = tsc; 353 353 354 354 priv->thermal_init(tsc); 355 - rcar_gen3_thermal_calc_coefs(tsc, ptat, thcodes[i], 356 - *rcar_gen3_ths_tj_1); 355 + rcar_gen3_thermal_calc_coefs(tsc, ptat, thcodes[i], *ths_tj_1); 357 356 358 357 zone = devm_thermal_zone_of_sensor_register(dev, i, tsc, 359 358 &rcar_gen3_tz_of_ops);