From 0fa04202078a7dae3a1199bd61951de3d915ede6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20S=C3=B6derlund?= Date: Tue, 10 Mar 2020 18:00:29 +0100 Subject: [PATCH] thermal: rcar_thermal: Remove lock in rcar_thermal_get_current_temp() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit With the ctemp value returned instead of cached in the private data structure their is no need to take the lock when translating ctemp into a temperature. Signed-off-by: Niklas Söderlund Reviewed-by: Geert Uytterhoeven Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20200310170029.1648996-4-niklas.soderlund+renesas@ragnatech.se --- drivers/thermal/rcar_thermal.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 4a45b314ef30..e0c1f2409035 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -254,24 +254,20 @@ err_out_unlock: static int rcar_thermal_get_current_temp(struct rcar_thermal_priv *priv, int *temp) { - int ctemp, tmp; + int ctemp; ctemp = rcar_thermal_update_temp(priv); if (ctemp < 0) return ctemp; - mutex_lock(&priv->lock); + /* Guaranteed operating range is -45C to 125C. */ + if (priv->chip->ctemp_bands == 1) - tmp = MCELSIUS((ctemp * 5) - 65); + *temp = MCELSIUS((ctemp * 5) - 65); else if (ctemp < 24) - tmp = MCELSIUS(((ctemp * 55) - 720) / 10); + *temp = MCELSIUS(((ctemp * 55) - 720) / 10); else - tmp = MCELSIUS((ctemp * 5) - 60); - mutex_unlock(&priv->lock); - - /* Guaranteed operating range is -45C to 125C. */ - - *temp = tmp; + *temp = MCELSIUS((ctemp * 5) - 60); return 0; } -- 2.20.1