kernel: update 4.1 to 4.1.13

[openwrt/openwrt.git] / target / linux / mediatek / patches / 0018-thermal-of-always-set-sensor-related-callbacks.patch

diff --git a/target/linux/mediatek/patches/0018-thermal-of-always-set-sensor-related-callbacks.patch b/target/linux/mediatek/patches/0018-thermal-of-always-set-sensor-related-callbacks.patch
index e47e8a27f049f52a07ae83b1026432c52c9e7851..3cd2e90315c6678d880a12e9a92e7130d147d01b 100644 (file)
--- a/target/linux/mediatek/patches/0018-thermal-of-always-set-sensor-related-callbacks.patch
+++ b/target/linux/mediatek/patches/0018-thermal-of-always-set-sensor-related-callbacks.patch
@@ -13,11 +13,9 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  drivers/thermal/of-thermal.c |   33 +++++++++++++--------------------
  1 file changed, 13 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
-index c84404d..b9c35bd 100644
 --- a/drivers/thermal/of-thermal.c
 +++ b/drivers/thermal/of-thermal.c
-@@ -91,7 +91,7 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz,
+@@ -91,7 +91,7 @@ static int of_thermal_get_temp(struct th
  {
        struct __thermal_zone *data = tz->devdata;
  
@@ -26,7 +24,7 @@ index c84404d..b9c35bd 100644
                return -EINVAL;
  
        return data->ops->get_temp(data->sensor_data, temp);
-@@ -178,7 +178,7 @@ static int of_thermal_set_emul_temp(struct thermal_zone_device *tz,
+@@ -178,7 +178,7 @@ static int of_thermal_set_emul_temp(stru
        struct __thermal_zone *data = tz->devdata;
  
        if (!data->ops || !data->ops->set_emul_temp)
@@ -35,7 +33,7 @@ index c84404d..b9c35bd 100644
  
        return data->ops->set_emul_temp(data->sensor_data, temp);
  }
-@@ -189,8 +189,8 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip,
+@@ -189,8 +189,8 @@ static int of_thermal_get_trend(struct t
        struct __thermal_zone *data = tz->devdata;
        int r;
  
@@ -46,7 +44,7 @@ index c84404d..b9c35bd 100644
  
        r = data->ops->get_trend(data->sensor_data, trip, trend);
        if (r)
-@@ -366,6 +366,10 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz,
+@@ -366,6 +366,10 @@ static int of_thermal_get_crit_temp(stru
  }
  
  static struct thermal_zone_device_ops of_thermal_ops = {
@@ -57,7 +55,7 @@ index c84404d..b9c35bd 100644
        .get_mode = of_thermal_get_mode,
        .set_mode = of_thermal_set_mode,
  
-@@ -399,13 +403,13 @@ thermal_zone_of_add_sensor(struct device_node *zone,
+@@ -399,13 +403,13 @@ thermal_zone_of_add_sensor(struct device
        if (!ops)
                return ERR_PTR(-EINVAL);
  
@@ -74,7 +72,7 @@ index c84404d..b9c35bd 100644
        mutex_unlock(&tzd->lock);
  
        return tzd;
-@@ -535,9 +539,6 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
+@@ -535,9 +539,6 @@ void thermal_zone_of_sensor_unregister(s
                return;
  
        mutex_lock(&tzd->lock);
@@ -124,6 +122,3 @@ index c84404d..b9c35bd 100644
                        of_thermal_free_zone(tz);
                        /* attempting to build remaining zones still */
                }
--- 
-1.7.10.4
-