thermal: Remove debug or error messages in get_temp() ops

Some get_temp() ops implementation are showing an error or a debug
message if the reading of the sensor fails.

The debug message is already displayed from the call site of this
ops. So we can remove it.

On the other side, the error should not be displayed because in
production that can raise tons of messages.

Finally, some drivers are showing a debug message with the
temperature, this is also accessible through the trace from the core
code in the temperature_update() function.

Another benefit is the dev_* messages are accessing the thermal zone
device field from the structure, so we encapsulate even more the code
by preventing these accesses.

Remove those messages.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> #Armada
Acked-by: Florian Fainelli <f.fainelli@gmail.com> #brcmstb_thermal.c
Acked-by: Heiko Stuebner <heiko@sntech.de> #rockchip
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index ebd606861a617ef54f81ffd1d7578ef0ddf64383..0e8dfa6a7757ba9392bf81b4902de7ad82f5856b 100644 (file)
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -360,11 +360,8 @@ static int armada_select_channel(struct armada_thermal_priv *priv, int channel)
         * we must absolutely wait for the sensor validity bit to ensure we read
         * actual data.
         */
-       if (armada_wait_sensor_validity(priv)) {
-               dev_err(priv->dev,
-                       "Temperature sensor reading not valid\n");
+       if (armada_wait_sensor_validity(priv))
                return -EIO;
-       }
 
        return 0;
 }
@@ -402,11 +399,8 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal,
        int ret;
 
        /* Valid check */
-       if (!armada_is_valid(priv)) {
-               dev_err(priv->dev,
-                       "Temperature sensor reading not valid\n");
+       if (!armada_is_valid(priv))
                return -EIO;
-       }
 
        /* Do the actual reading */
        ret = armada_read_sensor(priv, temp);

diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c
index 60173cc83c46cba07e13c64324251de25d1671f2..72d1dbe60b8f5c1a82835515cf004023022cb91e 100644 (file)
--- a/drivers/thermal/broadcom/brcmstb_thermal.c
+++ b/drivers/thermal/broadcom/brcmstb_thermal.c
@@ -158,10 +158,8 @@ static int brcmstb_get_temp(struct thermal_zone_device *tz, int *temp)
 
        val = __raw_readl(priv->tmon_base + AVS_TMON_STATUS);
 
-       if (!(val & AVS_TMON_STATUS_valid_msk)) {
-               dev_err(priv->dev, "reading not valid\n");
+       if (!(val & AVS_TMON_STATUS_valid_msk))
                return -EIO;
-       }
 
        val = (val & AVS_TMON_STATUS_data_msk) >> AVS_TMON_STATUS_data_shift;
 

diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
index 6db1882e822917ce7d0efa24518826256e323a91..9954040d1d2cca5dd589cc99d41977c6a2646b9b 100644 (file)
--- a/drivers/thermal/dove_thermal.c
+++ b/drivers/thermal/dove_thermal.c
@@ -91,11 +91,8 @@ static int dove_get_temp(struct thermal_zone_device *thermal,
 
        /* Valid check */
        reg = readl_relaxed(priv->control + PMU_TEMP_DIOD_CTRL1_REG);
-       if ((reg & PMU_TDC1_TEMP_VALID_MASK) == 0x0) {
-               dev_err(&thermal->device,
-                       "Temperature sensor reading not valid\n");
+       if ((reg & PMU_TDC1_TEMP_VALID_MASK) == 0x0)
                return -EIO;
-       }
 
        /*
         * Calculate temperature. According to Marvell internal

diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index f3a374266fa0e624a25364c8820e2689bf71c77d..0d135b8a5b622f83ff1b63941430bab24c14a4d5 100644 (file)
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -436,9 +436,6 @@ static int hisi_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
 
        *temp = data->ops->get_temp(sensor);
 
-       dev_dbg(&data->pdev->dev, "tzd=%p, id=%d, temp=%d, thres=%d\n",
-               sensor->tzd, sensor->id, *temp, sensor->thres_temp);
-
        return 0;
 }
 

diff --git a/drivers/thermal/imx_sc_thermal.c b/drivers/thermal/imx_sc_thermal.c
index ddde4bdfc94a3284468bca00ace8b2f09cf89a3f..2d7a6bd2846beb1f46e52d8c1601322a6c4ef44b 100644 (file)
--- a/drivers/thermal/imx_sc_thermal.c
+++ b/drivers/thermal/imx_sc_thermal.c
@@ -58,11 +58,8 @@ static int imx_sc_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
        hdr->size = 2;
 
        ret = imx_scu_call_rpc(thermal_ipc_handle, &msg, true);
-       if (ret) {
-               dev_err(&sensor->tzd->device, "read temp sensor %d failed, ret %d\n",
-                       sensor->resource_id, ret);
+       if (ret)
                return ret;
-       }
 
        *temp = msg.data.resp.celsius * 1000 + msg.data.resp.tenths * 100;
 

diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index a22b8086a209a17720b8f55f4fc651b16d5105b9..a0b8de269986a5867a3b5fb73dade22f38968813 100644 (file)
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -265,10 +265,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)
 
        regmap_read(map, soc_data->temp_data, &val);
 
-       if ((val & soc_data->temp_valid_mask) == 0) {
-               dev_dbg(&tz->device, "temp measurement never finished\n");
+       if ((val & soc_data->temp_valid_mask) == 0)
                return -EAGAIN;
-       }
 
        n_meas = (val & soc_data->temp_value_mask)
                >> soc_data->temp_value_shift;

diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
index 92b3ce426b9ded68f056783a76cedf41273ed1fb..668747bd86ef67581053b826e3c153223b50e08e 100644 (file)
--- a/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -33,11 +33,8 @@ static int kirkwood_get_temp(struct thermal_zone_device *thermal,
 
        /* Valid check */
        if (!((reg >> KIRKWOOD_THERMAL_VALID_OFFSET) &
-           KIRKWOOD_THERMAL_VALID_MASK)) {
-               dev_err(&thermal->device,
-                       "Temperature sensor reading not valid\n");
+           KIRKWOOD_THERMAL_VALID_MASK))
                return -EIO;
-       }
 
        /*
         * Calculate temperature. According to Marvell internal

diff --git a/drivers/thermal/max77620_thermal.c b/drivers/thermal/max77620_thermal.c
index bf1679765f1b2ee85e1978cd220ee8144b49c3c6..61c7622d9945dbdc2901e87ab0115fe204e3d881 100644 (file)
--- a/drivers/thermal/max77620_thermal.c
+++ b/drivers/thermal/max77620_thermal.c
@@ -51,10 +51,8 @@ static int max77620_thermal_read_temp(struct thermal_zone_device *tz, int *temp)
        int ret;
 
        ret = regmap_read(mtherm->rmap, MAX77620_REG_STATLBT, &val);
-       if (ret < 0) {
-               dev_err(mtherm->dev, "Failed to read STATLBT: %d\n", ret);
+       if (ret < 0)
                return ret;
-       }
 
        if (val & MAX77620_IRQ_TJALRM2_MASK)
                *temp = MAX77620_TJALARM2_TEMP;

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 8a51eb26e79871b4235d014672f63102a2e5a0c1..71e533df563a94fd63b7c7db3eb210cca2f381e5 100644 (file)
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1233,9 +1233,6 @@ static int rockchip_thermal_get_temp(struct thermal_zone_device *tz, int *out_te
 
        retval = tsadc->get_temp(&tsadc->table,
                                 sensor->id, thermal->regs, out_temp);
-       dev_dbg(&thermal->pdev->dev, "sensor %d - temp: %d, retval: %d\n",
-               sensor->id, *out_temp, retval);
-
        return retval;
 }
 

diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c
index 6ed393218eb8dd87a03bf6da2ed7dbe9c034f974..2d30420984454e4bbc071fd275c61f6dd2f37b71 100644 (file)
--- a/drivers/thermal/st/st_thermal.c
+++ b/drivers/thermal/st/st_thermal.c
@@ -109,7 +109,6 @@ static int st_thermal_calibration(struct st_thermal_sensor *sensor)
 static int st_thermal_get_temp(struct thermal_zone_device *th, int *temperature)
 {
        struct st_thermal_sensor *sensor = thermal_zone_device_priv(th);
-       struct device *dev = sensor->dev;
        unsigned int temp;
        unsigned int overflow;
        int ret;
@@ -127,8 +126,6 @@ static int st_thermal_get_temp(struct thermal_zone_device *th, int *temperature)
        temp += sensor->cdata->temp_adjust_val;
        temp = mcelsius(temp);
 
-       dev_dbg(dev, "temperature: %d\n", temp);
-
        *temperature = temp;
 
        return 0;

diff --git a/drivers/thermal/thermal-generic-adc.c b/drivers/thermal/thermal-generic-adc.c
index 2c283e762d8183594ce778bcba39e9e10f4455c7..017b0ce521229db7a259512a405393caca952e62 100644 (file)
--- a/drivers/thermal/thermal-generic-adc.c
+++ b/drivers/thermal/thermal-generic-adc.c
@@ -59,10 +59,9 @@ static int gadc_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
        int ret;
 
        ret = iio_read_channel_processed(gti->channel, &val);
-       if (ret < 0) {
-               dev_err(gti->dev, "IIO channel read failed %d\n", ret);
+       if (ret < 0)
                return ret;
-       }
+
        *temp = gadc_thermal_adc_to_temp(gti, val);
 
        return 0;