Merge tag 'apparmor-pr-2023-07-06' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / drivers / thermal / kirkwood_thermal.c

diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
index bec7ec20e79d5e86830eb1764d8baa2eca79f805..668747bd86ef67581053b826e3c153223b50e08e 100644 (file)
--- a/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -27,17 +27,14 @@ static int kirkwood_get_temp(struct thermal_zone_device *thermal,
                          int *temp)
 {
        unsigned long reg;
-       struct kirkwood_thermal_priv *priv = thermal->devdata;
+       struct kirkwood_thermal_priv *priv = thermal_zone_device_priv(thermal);
 
        reg = readl_relaxed(priv->sensor);
 
        /* 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