From 5d2f529c9b83d5f769258928b5ddd82f4dc9979e Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 21 Mar 2016 20:42:51 +0000 Subject: mediatek: bump to v4.4 Signed-off-by: John Crispin SVN-Revision: 49064 --- ...15-thermal-inline-only-once-used-function.patch | 70 ---------------------- 1 file changed, 70 deletions(-) delete mode 100644 target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch (limited to 'target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch') diff --git a/target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch b/target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch deleted file mode 100644 index 0ac3aa9..0000000 --- a/target/linux/mediatek/patches/0015-thermal-inline-only-once-used-function.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 0b729a98127ef045096edf20dfe5c4eadac21d44 Mon Sep 17 00:00:00 2001 -From: Sascha Hauer -Date: Wed, 13 May 2015 10:52:34 +0200 -Subject: [PATCH 15/76] thermal: inline only once used function - -Inline update_temperature into its only caller to make the code -more readable. - -Signed-off-by: Sascha Hauer -Reviewed-by: Mikko Perttunen ---- - drivers/thermal/thermal_core.c | 17 +++++------------ - 1 file changed, 5 insertions(+), 12 deletions(-) - ---- a/drivers/thermal/thermal_core.c -+++ b/drivers/thermal/thermal_core.c -@@ -453,9 +453,15 @@ exit: - } - EXPORT_SYMBOL_GPL(thermal_zone_get_temp); - --static void update_temperature(struct thermal_zone_device *tz) -+void thermal_zone_device_update(struct thermal_zone_device *tz) - { -- int temp, ret; -+ int temp, ret, count; -+ -+ if (atomic_read(&in_suspend)) -+ return; -+ -+ if (!tz->ops->get_temp) -+ return; - - ret = thermal_zone_get_temp(tz, &temp); - if (ret) { -@@ -478,7 +484,11 @@ static void update_temperature(struct th - else - dev_dbg(&tz->device, "last_temperature=%d, current_temperature=%d\n", - tz->last_temperature, tz->temperature); -+ -+ for (count = 0; count < tz->trips; count++) -+ handle_thermal_trip(tz, count); - } -+EXPORT_SYMBOL_GPL(thermal_zone_device_update); - - static void thermal_zone_device_reset(struct thermal_zone_device *tz) - { -@@ -490,23 +500,6 @@ static void thermal_zone_device_reset(st - pos->initialized = false; - } - --void thermal_zone_device_update(struct thermal_zone_device *tz) --{ -- int count; -- -- if (atomic_read(&in_suspend)) -- return; -- -- if (!tz->ops->get_temp) -- return; -- -- update_temperature(tz); -- -- for (count = 0; count < tz->trips; count++) -- handle_thermal_trip(tz, count); --} --EXPORT_SYMBOL_GPL(thermal_zone_device_update); -- - static void thermal_zone_device_check(struct work_struct *work) - { - struct thermal_zone_device *tz = container_of(work, struct -- cgit v1.1