Commit 3ae5950d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Daniel Lezcano
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/9ea7e65d0331daba96f9a7925cb3d12d2170efb1.1623076804.git.geert+renesas@glider.be
parent 8946187a

drivers/thermal/rcar_gen3_thermal.c

+2 −3
Original line number Diff line number Diff line
@@ -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);