thermal: Explicitly enable non-changing thermal zone devices

Some thermal zone devices never change their state, so they should be
always enabled.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200629122925.21729-9-andrzej.p@collabora.com

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
index 3de8a5e83b6c7f73ac3868d2550bfef45f7fd073..e3510e9b21f3ceed337f92ede334d50a9efd7c7c 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
@@ -92,6 +92,14 @@ int cxgb4_thermal_init(struct adapter *adap)
                ch_thermal->tzdev = NULL;
                return ret;
        }
+
+       ret = thermal_zone_device_enable(ch_thermal->tzdev);
+       if (ret) {
+               dev_err(adap->pdev_dev, "Failed to enable thermal zone\n");
+               thermal_zone_device_unregister(adap->ch_thermal.tzdev);
+               return ret;
+       }
+
        return 0;
 }
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
index 418e59b7c6719d5c7bb9d51d2606edeecfef0727..0c95663bf9edcf26195facde3f351b5af40e05d5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
@@ -733,7 +733,7 @@ static  struct thermal_zone_device_ops tzone_ops = {
 
 static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)
 {
-       int i;
+       int i, ret;
        char name[16];
        static atomic_t counter = ATOMIC_INIT(0);
 
@@ -759,6 +759,13 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)
                return;
        }
 
+       ret = thermal_zone_device_enable(mvm->tz_device.tzone);
+       if (ret) {
+               IWL_DEBUG_TEMP(mvm, "Failed to enable thermal zone\n");
+               thermal_zone_device_unregister(mvm->tz_device.tzone);
+               return;
+       }
+
        /* 0 is a valid temperature,
         * so initialize the array with S16_MIN which invalid temperature
         */

diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index f402e2e74a38392e9abf1eae8debc3630dcc828c..f12f4e7bd971c14e2a737c1a1fe61435a1f23ee4 100644 (file)
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -493,6 +493,12 @@ static int mid_thermal_probe(struct platform_device *pdev)
                        ret = PTR_ERR(pinfo->tzd[i]);
                        goto err;
                }
+               ret = thermal_zone_device_enable(pinfo->tzd[i]);
+               if (ret) {
+                       kfree(td_info);
+                       thermal_zone_device_unregister(pinfo->tzd[i]);
+                       goto err;
+               }
        }
 
        pinfo->pdev = pdev;

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 02b37fe6061c08ee0b9ad97ccc8ff228f12d6fd2..90e56736d4794f6cdf68e9aa387857465bf9ae9c 100644 (file)
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -939,7 +939,7 @@ static struct thermal_zone_device_ops psy_tzd_ops = {
 
 static int psy_register_thermal(struct power_supply *psy)
 {
-       int i;
+       int i, ret;
 
        if (psy->desc->no_thermal)
                return 0;
@@ -949,7 +949,12 @@ static int psy_register_thermal(struct power_supply *psy)
                if (psy->desc->properties[i] == POWER_SUPPLY_PROP_TEMP) {
                        psy->tzd = thermal_zone_device_register(psy->desc->name,
                                        0, 0, psy, &psy_tzd_ops, NULL, 0, 0);
-                       return PTR_ERR_OR_ZERO(psy->tzd);
+                       if (IS_ERR(psy->tzd))
+                               return PTR_ERR(psy->tzd);
+                       ret = thermal_zone_device_enable(psy->tzd);
+                       if (ret)
+                               thermal_zone_device_unregister(psy->tzd);
+                       return ret;
                }
        }
        return 0;

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 7c447cd149e7fab3c25939041c4e6bf98e783167..c2ebfb5be4b3dc715c49b1bfec275df6836a34ba 100644 (file)
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -874,6 +874,12 @@ static int armada_thermal_probe(struct platform_device *pdev)
                        return PTR_ERR(tz);
                }
 
+               ret = thermal_zone_device_enable(tz);
+               if (ret) {
+                       thermal_zone_device_unregister(tz);
+                       return ret;
+               }
+
                drvdata->type = LEGACY;
                drvdata->data.tz = tz;
                platform_set_drvdata(pdev, drvdata);

diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
index 75901ced4a622f10484de23d1e36338a3dcdbe76..73182eb94bc08b6ccea494eb06c833010f0bd307 100644 (file)
--- a/drivers/thermal/dove_thermal.c
+++ b/drivers/thermal/dove_thermal.c
@@ -153,6 +153,12 @@ static int dove_thermal_probe(struct platform_device *pdev)
                return PTR_ERR(thermal);
        }
 
+       ret = thermal_zone_device_enable(thermal);
+       if (ret) {
+               thermal_zone_device_unregister(thermal);
+               return ret;
+       }
+
        platform_set_drvdata(pdev, thermal);
 
        return 0;

diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
index 432213272f1e7d88e1f3b494cd3b0792de4f38d5..6e479deff76b040d98870c415210896008a3027e 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
+++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
@@ -259,9 +259,14 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
                ret = PTR_ERR(int34x_thermal_zone->zone);
                goto err_thermal_zone;
        }
+       ret = thermal_zone_device_enable(int34x_thermal_zone->zone);
+       if (ret)
+               goto err_enable;
 
        return int34x_thermal_zone;
 
+err_enable:
+       thermal_zone_device_unregister(int34x_thermal_zone->zone);
 err_thermal_zone:
        acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
        kfree(int34x_thermal_zone->aux_trips);

diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c
index 56401fd4708d9904585bd9c4a37df798b91cafd9..65702094f3d3d73c42d0fbbf885c502bc8c61519 100644 (file)
--- a/drivers/thermal/intel/intel_pch_thermal.c
+++ b/drivers/thermal/intel/intel_pch_thermal.c
@@ -352,9 +352,14 @@ static int intel_pch_thermal_probe(struct pci_dev *pdev,
                err = PTR_ERR(ptd->tzd);
                goto error_cleanup;
        }
+       err = thermal_zone_device_enable(ptd->tzd);
+       if (err)
+               goto err_unregister;
 
        return 0;
 
+err_unregister:
+       thermal_zone_device_unregister(ptd->tzd);
 error_cleanup:
        iounmap(ptd->hw_base);
 error_release:

diff --git a/drivers/thermal/intel/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c
index f75271b669c654b2690382075366e9015f6cd1f2..4f1a2f7c016cc14edc25a1af043a9d30e3a0e650 100644 (file)
--- a/drivers/thermal/intel/intel_soc_dts_iosf.c
+++ b/drivers/thermal/intel/intel_soc_dts_iosf.c
@@ -329,6 +329,9 @@ static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts,
                ret = PTR_ERR(dts->tzone);
                goto err_ret;
        }
+       ret = thermal_zone_device_enable(dts->tzone);
+       if (ret)
+               goto err_enable;
 
        ret = soc_dts_enable(id);
        if (ret)

diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c
index a006b9fd1d72b04bf4381b0905d1728cded7c1eb..b81c33202f41a02e7a1f3fb8d3754fcf589a3504 100644 (file)
--- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
@@ -363,6 +363,12 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
                kfree(zonedev);
                return err;
        }
+       err = thermal_zone_device_enable(zonedev->tzone);
+       if (err) {
+               thermal_zone_device_unregister(zonedev->tzone);
+               kfree(zonedev);
+               return err;
+       }
        /* Store MSR value for package thermal interrupt, to restore at exit */
        rdmsr(MSR_IA32_PACKAGE_THERM_INTERRUPT, zonedev->msr_pkg_therm_low,
              zonedev->msr_pkg_therm_high);

diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
index 189b675cf14d9233cbd688c0e46108b1ac06a53e..7fb6e476c82a4be1982bfce70a35e0f7ea9bc35c 100644 (file)
--- a/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -65,6 +65,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)
        struct thermal_zone_device *thermal = NULL;
        struct kirkwood_thermal_priv *priv;
        struct resource *res;
+       int ret;
 
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -82,6 +83,12 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)
                        "Failed to register thermal zone device\n");
                return PTR_ERR(thermal);
        }
+       ret = thermal_zone_device_enable(thermal);
+       if (ret) {
+               thermal_zone_device_unregister(thermal);
+               dev_err(&pdev->dev, "Failed to enable thermal zone device\n");
+               return ret;
+       }
 
        platform_set_drvdata(pdev, thermal);
 

diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 46aeb28b4e901133ce06d07d4b78252e4f60ec8f..787710bb88fee890cc6afc419e5521e7d9092bfa 100644 (file)
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -550,12 +550,19 @@ static int rcar_thermal_probe(struct platform_device *pdev)
                        priv->zone = devm_thermal_zone_of_sensor_register(
                                                dev, i, priv,
                                                &rcar_thermal_zone_of_ops);
-               else
+               else {
                        priv->zone = thermal_zone_device_register(
                                                "rcar_thermal",
                                                1, 0, priv,
                                                &rcar_thermal_zone_ops, NULL, 0,
                                                idle);
+
+                       ret = thermal_zone_device_enable(priv->zone);
+                       if (ret) {
+                               thermal_zone_device_unregister(priv->zone);
+                               priv->zone = ERR_PTR(ret);
+                       }
+               }
                if (IS_ERR(priv->zone)) {
                        dev_err(dev, "can't register thermal zone\n");
                        ret = PTR_ERR(priv->zone);

diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index f68f581fd669202f600696221b0e2f79d140f580..ee33ed692e4f7ee13983e7fffee97d346a7a5e55 100644 (file)
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -131,6 +131,11 @@ static int spear_thermal_probe(struct platform_device *pdev)
                ret = PTR_ERR(spear_thermal);
                goto disable_clk;
        }
+       ret = thermal_zone_device_enable(spear_thermal);
+       if (ret) {
+               dev_err(&pdev->dev, "Cannot enable thermal zone\n");
+               goto unregister_tzd;
+       }
 
        platform_set_drvdata(pdev, spear_thermal);
 
@@ -139,6 +144,8 @@ static int spear_thermal_probe(struct platform_device *pdev)
 
        return 0;
 
+unregister_tzd:
+       thermal_zone_device_unregister(spear_thermal);
 disable_clk:
        clk_disable(stdev->clk);
 

diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c
index b928ca6a289b73a94af830ff8062bd62548c87a1..1276b95604fed7dc7b8a038ca95871ba0a136ff7 100644 (file)
--- a/drivers/thermal/st/st_thermal.c
+++ b/drivers/thermal/st/st_thermal.c
@@ -246,11 +246,16 @@ int st_thermal_register(struct platform_device *pdev,
                ret = PTR_ERR(sensor->thermal_dev);
                goto sensor_off;
        }
+       ret = thermal_zone_device_enable(sensor->thermal_dev);
+       if (ret)
+               goto tzd_unregister;
 
        platform_set_drvdata(pdev, sensor);
 
        return 0;
 
+tzd_unregister:
+       thermal_zone_device_unregister(sensor->thermal_dev);
 sensor_off:
        st_thermal_sensor_off(sensor);