Merge tag 'sound-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

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

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 2efc222a379bb22e6f9c2c2383f77bbd5f6f1809..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;
 }
@@ -398,15 +395,12 @@ static int armada_read_sensor(struct armada_thermal_priv *priv, int *temp)
 static int armada_get_temp_legacy(struct thermal_zone_device *thermal,
                                  int *temp)
 {
-       struct armada_thermal_priv *priv = thermal->devdata;
+       struct armada_thermal_priv *priv = thermal_zone_device_priv(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);
@@ -420,7 +414,7 @@ static struct thermal_zone_device_ops legacy_ops = {
 
 static int armada_get_temp(struct thermal_zone_device *tz, int *temp)
 {
-       struct armada_thermal_sensor *sensor = tz->devdata;
+       struct armada_thermal_sensor *sensor = thermal_zone_device_priv(tz);
        struct armada_thermal_priv *priv = sensor->priv;
        int ret;