OSDN Git Service

thermal/drivers/rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 7 Jun 2021 14:41:20 +0000 (16:41 +0200)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Mon, 14 Jun 2021 17:05:01 +0000 (19:05 +0200)
commit3ae5950db617d1cc3eb4eb55750fa9d138529b49
tree8c830bc482fb1ba956b7f6e4764fa4af7619725b
parent8946187ab57ffd02088e50256c73dd31f49db06d
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
drivers/thermal/rcar_gen3_thermal.c