thermal: stm32: Rework sensor mode management

Be sure get_temp returns an error while disabling or enabling the device.
Set THERMAL_DEVICE_ENABLED state at the end of power on function.
Set THERMAL_DEVICE_DISABLED state at the beginning of power off function.

Signed-off-by: Pascal Paillet <p.paillet@st.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200110101605.24984-3-p.paillet@st.com

diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c
index 7835e109692eae6710fab72d6f4c52d358a1f2ed..a21fa7e0c72b022dde608e2d67897402d8dc2bca 100644 (file)
--- a/drivers/thermal/st/stm_thermal.c
+++ b/drivers/thermal/st/stm_thermal.c
@@ -160,6 +160,8 @@ static int stm_sensor_power_on(struct stm_thermal_sensor *sensor)
        writel_relaxed(value, sensor->base +
                       DTS_CFGR1_OFFSET);
 
+       sensor->mode = THERMAL_DEVICE_ENABLED;
+
        return 0;
 }
 
@@ -167,6 +169,8 @@ static int stm_sensor_power_off(struct stm_thermal_sensor *sensor)
 {
        u32 value;
 
+       sensor->mode = THERMAL_DEVICE_DISABLED;
+
        /* Stop measuring */
        value = readl_relaxed(sensor->base + DTS_CFGR1_OFFSET);
        value &= ~TS1_START;
@@ -374,7 +378,6 @@ static int stm_thermal_update_threshold(struct stm_thermal_sensor *sensor)
 {
        int ret;
 
-       sensor->mode = THERMAL_DEVICE_DISABLED;
 
        ret = stm_sensor_power_off(sensor);
        if (ret)
@@ -576,8 +579,6 @@ static int stm_thermal_suspend(struct device *dev)
        if (ret)
                return ret;
 
-       sensor->mode = THERMAL_DEVICE_DISABLED;
-
        return 0;
 }
 
@@ -590,7 +591,6 @@ static int stm_thermal_resume(struct device *dev)
        if (ret)
                return ret;
 
-       sensor->mode = THERMAL_DEVICE_ENABLED;
 
        return 0;
 }
@@ -718,8 +718,6 @@ static int stm_thermal_probe(struct platform_device *pdev)
        if (ret)
                goto err_tz;
 
-       sensor->mode = THERMAL_DEVICE_ENABLED;
-
        dev_info(&pdev->dev, "%s: Driver initialized successfully\n",
                 __func__);