From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001
From: James <>
Date: Wed, 4 Nov 2015 11:49:21 +0000
Subject: trunk-47381

---
 ...3-thermal-Use-IS_ENABLED-instead-of-ifdef.patch | 106 +++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch

(limited to '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
new file mode 100644
index 0000000..0b033d6
--- /dev/null
+++ b/target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch
@@ -0,0 +1,106 @@
+From bddcae2b66a23bfb6d381d089b0b862235480a9b Mon Sep 17 00:00:00 2001
+From: Sascha Hauer <s.hauer@pengutronix.de>
+Date: Wed, 13 May 2015 10:52:32 +0200
+Subject: [PATCH 13/76] thermal: Use IS_ENABLED instead of #ifdef
+
+Use IS_ENABLED(CONFIG_THERMAL_EMULATION) to make the code more readable
+and to get rid of the addtional #ifdef around the variable definitions
+in thermal_zone_get_temp().
+
+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)
+ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
+ {
+ 	int ret = -EINVAL;
+-#ifdef CONFIG_THERMAL_EMULATION
+ 	int count;
+ 	int crit_temp = INT_MAX;
+ 	enum thermal_trip_type type;
+-#endif
+ 
+ 	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)
+ 	mutex_lock(&tz->lock);
+ 
+ 	ret = tz->ops->get_temp(tz, temp);
+-#ifdef CONFIG_THERMAL_EMULATION
+-	if (!tz->emul_temperature)
+-		goto skip_emul;
+-
+-	for (count = 0; count < tz->trips; count++) {
+-		ret = tz->ops->get_trip_type(tz, count, &type);
+-		if (!ret && type == THERMAL_TRIP_CRITICAL) {
+-			ret = tz->ops->get_trip_temp(tz, count, &crit_temp);
+-			break;
+-		}
+-	}
+ 
+-	if (ret)
+-		goto skip_emul;
++	if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) {
++		for (count = 0; count < tz->trips; count++) {
++			ret = tz->ops->get_trip_type(tz, count, &type);
++			if (!ret && type == THERMAL_TRIP_CRITICAL) {
++				ret = tz->ops->get_trip_temp(tz, count,
++						&crit_temp);
++				break;
++			}
++		}
+ 
+-	if (*temp < crit_temp)
+-		*temp = tz->emul_temperature;
+-skip_emul:
+-#endif
++		if (!ret && *temp < crit_temp)
++			*temp = tz->emul_temperature;
++	}
++ 
+ 	mutex_unlock(&tz->lock);
+ exit:
+ 	return ret;
+@@ -780,7 +774,6 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf)
+ 	return sprintf(buf, "%s\n", tz->governor->name);
+ }
+ 
+-#ifdef CONFIG_THERMAL_EMULATION
+ 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,
+ 	return ret ? ret : count;
+ }
+ static DEVICE_ATTR(emul_temp, S_IWUSR, NULL, emul_temp_store);
+-#endif/*CONFIG_THERMAL_EMULATION*/
+ 
+ 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,
+ 			goto unregister;
+ 	}
+ 
+-#ifdef CONFIG_THERMAL_EMULATION
+-	result = device_create_file(&tz->device, &dev_attr_emul_temp);
+-	if (result)
+-		goto unregister;
+-#endif
++	if (IS_ENABLED(CONFIG_THERMAL_EMULATION)) {
++		result = device_create_file(&tz->device, &dev_attr_emul_temp);
++		if (result)
++			goto unregister;
++	}
++
+ 	/* Create policy attribute */
+ 	result = device_create_file(&tz->device, &dev_attr_policy);
+ 	if (result)
+-- 
+1.7.10.4
+
-- 
cgit v1.2.3