summaryrefslogtreecommitdiff
path: root/drivers/thermal/armada_thermal.c
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2018-07-16 17:41:54 +0300
committerEduardo Valentin <edubezval@gmail.com>2018-07-28 00:43:11 +0300
commit68b14828ca102630e721d10b2e5dedc9c9b38095 (patch)
tree0deb8823eca89662b73722236290a2e2c5a82fba /drivers/thermal/armada_thermal.c
parent00707e4c9618949d492f685c324326f39f08ea9c (diff)
downloadlinux-68b14828ca102630e721d10b2e5dedc9c9b38095.tar.xz
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>
Diffstat (limited to 'drivers/thermal/armada_thermal.c')
-rw-r--r--drivers/thermal/armada_thermal.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 1f6bc317748d..53e757a28506 100644
--- 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);