projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 4.1 to version 4.1.20
[openwrt/svn-archive/archive.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 f0cbdb380b630e2bdfa42915aef19051c38a3317..6f4ca5a24b77ea12cf3308e2d3bf41b98c3f9791 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
@@
-14,7
+14,7
@@
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
-@@ -41
4,11 +414
,9 @@ static void handle_thermal_trip(struct t
+@@ -41
7,11 +417
,9 @@ static void handle_thermal_trip(struct t
int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
{
int ret = -EINVAL;
int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
{
int ret = -EINVAL;
@@
-26,7
+26,7
@@
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
if (!tz || IS_ERR(tz) || !tz->ops->get_temp)
goto exit;
if (!tz || IS_ERR(tz) || !tz->ops->get_temp)
goto exit;
-@@ -42
6,25 +424
,21 @@ int thermal_zone_get_temp(struct thermal
+@@ -42
9,25 +427
,21 @@ int thermal_zone_get_temp(struct thermal
mutex_lock(&tz->lock);
ret = tz->ops->get_temp(tz, temp);
mutex_lock(&tz->lock);
ret = tz->ops->get_temp(tz, temp);
@@
-65,7
+65,7
@@
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
mutex_unlock(&tz->lock);
exit:
return ret;
mutex_unlock(&tz->lock);
exit:
return ret;
-@@ -
780,7 +77
4,6 @@ policy_show(struct device *dev, struct d
+@@ -
800,7 +79
4,6 @@ policy_show(struct device *dev, struct d
return sprintf(buf, "%s\n", tz->governor->name);
}
return sprintf(buf, "%s\n", tz->governor->name);
}
@@
-73,7
+73,7
@@
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
static ssize_t
emul_temp_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
static ssize_t
emul_temp_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
-@@ -8
06,7 +79
9,6 @@ emul_temp_store(struct device *dev, stru
+@@ -8
26,7 +81
9,6 @@ emul_temp_store(struct device *dev, stru
return ret ? ret : count;
}
static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store);
return ret ? ret : count;
}
static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store);
@@
-81,7
+81,7
@@
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
static DEVICE_ATTR(type, 0444, type_show, NULL);
static DEVICE_ATTR(temp, 0444, temp_show, NULL);
static DEVICE_ATTR(type, 0444, type_show, NULL);
static DEVICE_ATTR(temp, 0444, temp_show, NULL);
-@@ -15
36,11 +152
8,12 @@ struct thermal_zone_device *thermal_zone
+@@ -15
66,11 +155
8,12 @@ struct thermal_zone_device *thermal_zone
goto unregister;
}
goto unregister;
}