thermal/hwmon: Do not set no_hwmon before calling thermal_add_hwmon_sysfs()

The thermal->tzp->no_hwmon parameter is only used when calling
thermal_zone_device_register().

Setting it to 'false' before calling thermal_add_hwmon_sysfs() has no
effect.

Remove the call and again prevent the drivers to access the thermal
internals.

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> #R-Car
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Florian Fainelli <f.fainelli@gmail.com> #Broadcom
Acked-by: Heiko Stuebner <heiko@sntech.de> #rockchip
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/thermal/broadcom/bcm2711_thermal.c b/drivers/thermal/broadcom/bcm2711_thermal.c
index fcfcbbf044a42461a2ee40e4612806046aab286c..c243a76a347174c81a44e1cb4b61c30f73de64c6 100644 (file)
--- a/drivers/thermal/broadcom/bcm2711_thermal.c
+++ b/drivers/thermal/broadcom/bcm2711_thermal.c
@@ -98,7 +98,6 @@ static int bcm2711_thermal_probe(struct platform_device *pdev)
 
        priv->thermal = thermal;
 
-       thermal->tzp->no_hwmon = false;
        return thermal_add_hwmon_sysfs(thermal);
 }
 

diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index 86aaf459de3710a7e1690d689f33d3d647e94b9f..a217d832f24e5880b327d6e273adb923f3043788 100644 (file)
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -267,7 +267,6 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
         * Thermal_zone doesn't enable hwmon as default,
         * enable it here
         */
-       tz->tzp->no_hwmon = false;
        err = thermal_add_hwmon_sysfs(tz);
        if (err)
                goto err_tz;

diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
index 2b7537ef141dc4351869864c29d09eadfa8b9ab5..3df00c9d55ab12179c879d7110824bed9e3f88c2 100644 (file)
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/rcar_gen3_thermal.c
@@ -527,7 +527,6 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev)
                }
                tsc->zone = zone;
 
-               tsc->zone->tzp->no_hwmon = false;
                ret = thermal_add_hwmon_sysfs(tsc->zone);
                if (ret)
                        goto error_unregister;

diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index e0440f63ae77358f90a6769bd2e23fe0dafe96d4..b8571f7090aada674817e752fc4258264e5d5027 100644 (file)
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -509,11 +509,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
                }
 
                if (chip->use_of_thermal) {
-                       /*
-                        * thermal_zone doesn't enable hwmon as default,
-                        * but, enable it here to keep compatible
-                        */
-                       priv->zone->tzp->no_hwmon = false;
                        ret = thermal_add_hwmon_sysfs(priv->zone);
                        if (ret)
                                goto error_unregister;

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 71e533df563a94fd63b7c7db3eb210cca2f381e5..bb254bdff0433612077af22282fc53274af74c29 100644 (file)
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1451,7 +1451,6 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
 
        for (i = 0; i < thermal->chip->chn_num; i++) {
                rockchip_thermal_toggle_sensor(&thermal->sensors[i], true);
-               thermal->sensors[i].tzd->tzp->no_hwmon = false;
                error = thermal_add_hwmon_sysfs(thermal->sensors[i].tzd);
                if (error)
                        dev_warn(&pdev->dev,

diff --git a/drivers/thermal/rzg2l_thermal.c b/drivers/thermal/rzg2l_thermal.c
index 7631430ce8a920e683abe75c652197148411c9c8..b56981f85306bcbe32e391d0cd9a9f125fb3f98c 100644 (file)
--- a/drivers/thermal/rzg2l_thermal.c
+++ b/drivers/thermal/rzg2l_thermal.c
@@ -216,7 +216,6 @@ static int rzg2l_thermal_probe(struct platform_device *pdev)
        }
 
        priv->zone = zone;
-       priv->zone->tzp->no_hwmon = false;
        ret = thermal_add_hwmon_sysfs(priv->zone);
        if (ret)
                goto err;