kernel: update 4.1 to 4.1.13

[openwrt/staging/chunkeey.git] / target / linux / mediatek / patches / 0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch

diff --git a/target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch b/target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch
index 0b033d65e1006764b5d11046fd2457730c7e2401..f0cbdb380b630e2bdfa42915aef19051c38a3317 100644 (file)
--- a/target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch
+++ b/target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch
@@ -12,11 +12,9 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  drivers/thermal/thermal_core.c |   45 +++++++++++++++++-----------------------
  1 file changed, 19 insertions(+), 26 deletions(-)
 
-diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
-index 1b68d20..3e0fe55 100644
 --- a/drivers/thermal/thermal_core.c
 +++ b/drivers/thermal/thermal_core.c
-@@ -414,11 +414,9 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
+@@ -414,11 +414,9 @@ static void handle_thermal_trip(struct t
  int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
  {
        int ret = -EINVAL;
@@ -28,7 +26,7 @@ index 1b68d20..3e0fe55 100644
  
        if (!tz || IS_ERR(tz) || !tz->ops->get_temp)
                goto exit;
-@@ -426,25 +424,21 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
+@@ -426,25 +424,21 @@ int thermal_zone_get_temp(struct thermal
        mutex_lock(&tz->lock);
  
        ret = tz->ops->get_temp(tz, temp);
@@ -67,7 +65,7 @@ index 1b68d20..3e0fe55 100644
        mutex_unlock(&tz->lock);
  exit:
        return ret;
-@@ -780,7 +774,6 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf)
+@@ -780,7 +774,6 @@ policy_show(struct device *dev, struct d
        return sprintf(buf, "%s\n", tz->governor->name);
  }
  
@@ -75,7 +73,7 @@ index 1b68d20..3e0fe55 100644
  static ssize_t
  emul_temp_store(struct device *dev, struct device_attribute *attr,
                     const char *buf, size_t count)
-@@ -806,7 +799,6 @@ emul_temp_store(struct device *dev, struct device_attribute *attr,
+@@ -806,7 +799,6 @@ emul_temp_store(struct device *dev, stru
        return ret ? ret : count;
  }
  static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store);
@@ -83,7 +81,7 @@ index 1b68d20..3e0fe55 100644
  
  static DEVICE_ATTR(type, 0444, type_show, NULL);
  static DEVICE_ATTR(temp, 0444, temp_show, NULL);
-@@ -1536,11 +1528,12 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
+@@ -1536,11 +1528,12 @@ struct thermal_zone_device *thermal_zone
                        goto unregister;
        }
  
@@ -101,6 +99,3 @@ index 1b68d20..3e0fe55 100644
        /* Create policy attribute */
        result = device_create_file(&tz->device, &dev_attr_policy);
        if (result)
--- 
-1.7.10.4
-