Commit abda7383 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Rafael J. Wysocki

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: default avatarDaniel 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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 4216e815
...@@ -360,11 +360,8 @@ static int armada_select_channel(struct armada_thermal_priv *priv, int channel) ...@@ -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 * we must absolutely wait for the sensor validity bit to ensure we read
* actual data. * actual data.
*/ */
if (armada_wait_sensor_validity(priv)) { if (armada_wait_sensor_validity(priv))
dev_err(priv->dev,
"Temperature sensor reading not valid\n");
return -EIO; return -EIO;
}
return 0; return 0;
} }
...@@ -402,11 +399,8 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal, ...@@ -402,11 +399,8 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal,
int ret; int ret;
/* Valid check */ /* Valid check */
if (!armada_is_valid(priv)) { if (!armada_is_valid(priv))
dev_err(priv->dev,
"Temperature sensor reading not valid\n");
return -EIO; return -EIO;
}
/* Do the actual reading */ /* Do the actual reading */
ret = armada_read_sensor(priv, temp); ret = armada_read_sensor(priv, temp);
......
...@@ -158,10 +158,8 @@ static int brcmstb_get_temp(struct thermal_zone_device *tz, int *temp) ...@@ -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); val = __raw_readl(priv->tmon_base + AVS_TMON_STATUS);
if (!(val & AVS_TMON_STATUS_valid_msk)) { if (!(val & AVS_TMON_STATUS_valid_msk))
dev_err(priv->dev, "reading not valid\n");
return -EIO; return -EIO;
}
val = (val & AVS_TMON_STATUS_data_msk) >> AVS_TMON_STATUS_data_shift; val = (val & AVS_TMON_STATUS_data_msk) >> AVS_TMON_STATUS_data_shift;
......
...@@ -91,11 +91,8 @@ static int dove_get_temp(struct thermal_zone_device *thermal, ...@@ -91,11 +91,8 @@ static int dove_get_temp(struct thermal_zone_device *thermal,
/* Valid check */ /* Valid check */
reg = readl_relaxed(priv->control + PMU_TEMP_DIOD_CTRL1_REG); reg = readl_relaxed(priv->control + PMU_TEMP_DIOD_CTRL1_REG);
if ((reg & PMU_TDC1_TEMP_VALID_MASK) == 0x0) { if ((reg & PMU_TDC1_TEMP_VALID_MASK) == 0x0)
dev_err(&thermal->device,
"Temperature sensor reading not valid\n");
return -EIO; return -EIO;
}
/* /*
* Calculate temperature. According to Marvell internal * Calculate temperature. According to Marvell internal
......
...@@ -436,9 +436,6 @@ static int hisi_thermal_get_temp(struct thermal_zone_device *tz, int *temp) ...@@ -436,9 +436,6 @@ static int hisi_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
*temp = data->ops->get_temp(sensor); *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; return 0;
} }
......
...@@ -58,11 +58,8 @@ static int imx_sc_thermal_get_temp(struct thermal_zone_device *tz, int *temp) ...@@ -58,11 +58,8 @@ static int imx_sc_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
hdr->size = 2; hdr->size = 2;
ret = imx_scu_call_rpc(thermal_ipc_handle, &msg, true); ret = imx_scu_call_rpc(thermal_ipc_handle, &msg, true);
if (ret) { if (ret)
dev_err(&sensor->tzd->device, "read temp sensor %d failed, ret %d\n",
sensor->resource_id, ret);
return ret; return ret;
}
*temp = msg.data.resp.celsius * 1000 + msg.data.resp.tenths * 100; *temp = msg.data.resp.celsius * 1000 + msg.data.resp.tenths * 100;
......
...@@ -265,10 +265,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) ...@@ -265,10 +265,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)
regmap_read(map, soc_data->temp_data, &val); regmap_read(map, soc_data->temp_data, &val);
if ((val & soc_data->temp_valid_mask) == 0) { if ((val & soc_data->temp_valid_mask) == 0)
dev_dbg(&tz->device, "temp measurement never finished\n");
return -EAGAIN; return -EAGAIN;
}
n_meas = (val & soc_data->temp_value_mask) n_meas = (val & soc_data->temp_value_mask)
>> soc_data->temp_value_shift; >> soc_data->temp_value_shift;
......
...@@ -33,11 +33,8 @@ static int kirkwood_get_temp(struct thermal_zone_device *thermal, ...@@ -33,11 +33,8 @@ static int kirkwood_get_temp(struct thermal_zone_device *thermal,
/* Valid check */ /* Valid check */
if (!((reg >> KIRKWOOD_THERMAL_VALID_OFFSET) & if (!((reg >> KIRKWOOD_THERMAL_VALID_OFFSET) &
KIRKWOOD_THERMAL_VALID_MASK)) { KIRKWOOD_THERMAL_VALID_MASK))
dev_err(&thermal->device,
"Temperature sensor reading not valid\n");
return -EIO; return -EIO;
}
/* /*
* Calculate temperature. According to Marvell internal * Calculate temperature. According to Marvell internal
......
...@@ -51,10 +51,8 @@ static int max77620_thermal_read_temp(struct thermal_zone_device *tz, int *temp) ...@@ -51,10 +51,8 @@ static int max77620_thermal_read_temp(struct thermal_zone_device *tz, int *temp)
int ret; int ret;
ret = regmap_read(mtherm->rmap, MAX77620_REG_STATLBT, &val); ret = regmap_read(mtherm->rmap, MAX77620_REG_STATLBT, &val);
if (ret < 0) { if (ret < 0)
dev_err(mtherm->dev, "Failed to read STATLBT: %d\n", ret);
return ret; return ret;
}
if (val & MAX77620_IRQ_TJALRM2_MASK) if (val & MAX77620_IRQ_TJALRM2_MASK)
*temp = MAX77620_TJALARM2_TEMP; *temp = MAX77620_TJALARM2_TEMP;
......
...@@ -1233,9 +1233,6 @@ static int rockchip_thermal_get_temp(struct thermal_zone_device *tz, int *out_te ...@@ -1233,9 +1233,6 @@ static int rockchip_thermal_get_temp(struct thermal_zone_device *tz, int *out_te
retval = tsadc->get_temp(&tsadc->table, retval = tsadc->get_temp(&tsadc->table,
sensor->id, thermal->regs, out_temp); 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; return retval;
} }
......
...@@ -109,7 +109,6 @@ static int st_thermal_calibration(struct st_thermal_sensor *sensor) ...@@ -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) static int st_thermal_get_temp(struct thermal_zone_device *th, int *temperature)
{ {
struct st_thermal_sensor *sensor = thermal_zone_device_priv(th); struct st_thermal_sensor *sensor = thermal_zone_device_priv(th);
struct device *dev = sensor->dev;
unsigned int temp; unsigned int temp;
unsigned int overflow; unsigned int overflow;
int ret; int ret;
...@@ -127,8 +126,6 @@ static int st_thermal_get_temp(struct thermal_zone_device *th, int *temperature) ...@@ -127,8 +126,6 @@ static int st_thermal_get_temp(struct thermal_zone_device *th, int *temperature)
temp += sensor->cdata->temp_adjust_val; temp += sensor->cdata->temp_adjust_val;
temp = mcelsius(temp); temp = mcelsius(temp);
dev_dbg(dev, "temperature: %d\n", temp);
*temperature = temp; *temperature = temp;
return 0; return 0;
......
...@@ -59,10 +59,9 @@ static int gadc_thermal_get_temp(struct thermal_zone_device *tz, int *temp) ...@@ -59,10 +59,9 @@ static int gadc_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
int ret; int ret;
ret = iio_read_channel_processed(gti->channel, &val); ret = iio_read_channel_processed(gti->channel, &val);
if (ret < 0) { if (ret < 0)
dev_err(gti->dev, "IIO channel read failed %d\n", ret);
return ret; return ret;
}
*temp = gadc_thermal_adc_to_temp(gti, val); *temp = gadc_thermal_adc_to_temp(gti, val);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment