aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch')
-rw-r--r--target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch101
1 files changed, 0 insertions, 101 deletions
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
deleted file mode 100644
index 6f4ca5a24b..0000000000
--- a/target/linux/mediatek/patches/0013-thermal-Use-IS_ENABLED-instead-of-ifdef.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-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(-)
-
---- a/drivers/thermal/thermal_core.c
-+++ b/drivers/thermal/thermal_core.c
-@@ -417,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;
--#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;
-@@ -429,25 +427,21 @@ int thermal_zone_get_temp(struct thermal
- 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;
-@@ -800,7 +794,6 @@ policy_show(struct device *dev, struct d
- 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)
-@@ -826,7 +819,6 @@ emul_temp_store(struct device *dev, stru
- 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);
-@@ -1566,11 +1558,12 @@ struct thermal_zone_device *thermal_zone
- 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)