thermal: armada: move validity check out of the read function

Sensor selection when using multiple sensors already checks for the
sensor validity. Move it to the legacy ->get_temp() hook, where it is
still needed.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 1f6bc317748d0ae66ffcb72360d408c2d86ec28e..53e757a2850617bf944649ca41efcf4358a49147 100644 (file)
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -329,13 +329,6 @@ static int armada_read_sensor(struct armada_thermal_priv *priv, int *temp)
        u32 reg, div;
        s64 sample, b, m;
 
-       /* Valid check */
-       if (priv->data->is_valid && !priv->data->is_valid(priv)) {
-               dev_err(priv->dev,
-                       "Temperature sensor reading not valid\n");
-               return -EIO;
-       }
-
        regmap_read(priv->syscon, priv->data->syscon_status_off, &reg);
        reg = (reg >> priv->data->temp_shift) & priv->data->temp_mask;
        if (priv->data->signed_sample)
@@ -363,6 +356,13 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal,
        struct armada_thermal_priv *priv = thermal->devdata;
        int ret;
 
+       /* Valid check */
+       if (priv->data->is_valid && !priv->data->is_valid(priv)) {
+               dev_err(priv->dev,
+                       "Temperature sensor reading not valid\n");
+               return -EIO;
+       }
+
        /* Do the actual reading */
        ret = armada_read_sensor(priv, temp);