aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches/0016-thermal-streamline-get_trend-callbacks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mediatek/patches/0016-thermal-streamline-get_trend-callbacks.patch')
-rw-r--r--target/linux/mediatek/patches/0016-thermal-streamline-get_trend-callbacks.patch17
1 files changed, 4 insertions, 13 deletions
diff --git a/target/linux/mediatek/patches/0016-thermal-streamline-get_trend-callbacks.patch b/target/linux/mediatek/patches/0016-thermal-streamline-get_trend-callbacks.patch
index 99d490f2bb..3ee345e688 100644
--- a/target/linux/mediatek/patches/0016-thermal-streamline-get_trend-callbacks.patch
+++ b/target/linux/mediatek/patches/0016-thermal-streamline-get_trend-callbacks.patch
@@ -25,11 +25,9 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
include/linux/thermal.h | 2 +-
3 files changed, 10 insertions(+), 28 deletions(-)
-diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
-index 03839df..c84404d 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
-@@ -187,24 +187,15 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip,
+@@ -187,24 +187,15 @@ static int of_thermal_get_trend(struct t
enum thermal_trend *trend)
{
struct __thermal_zone *data = tz->devdata;
@@ -55,11 +53,9 @@ index 03839df..c84404d 100644
return 0;
}
-diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
-index d3a42bf..ade78eb 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
-@@ -238,7 +238,7 @@ static int ti_thermal_get_trip_temp(struct thermal_zone_device *thermal,
+@@ -238,7 +238,7 @@ static int ti_thermal_get_trip_temp(stru
return 0;
}
@@ -68,7 +64,7 @@ index d3a42bf..ade78eb 100644
{
struct ti_thermal_data *data = p;
struct ti_bandgap *bgp;
-@@ -251,22 +251,6 @@ static int __ti_thermal_get_trend(void *p, long *trend)
+@@ -251,22 +251,6 @@ static int __ti_thermal_get_trend(void *
if (ret)
return ret;
@@ -91,7 +87,7 @@ index d3a42bf..ade78eb 100644
if (tr > 0)
*trend = THERMAL_TREND_RAISING;
else if (tr < 0)
-@@ -277,6 +261,13 @@ static int ti_thermal_get_trend(struct thermal_zone_device *thermal,
+@@ -277,6 +261,13 @@ static int ti_thermal_get_trend(struct t
return 0;
}
@@ -105,8 +101,6 @@ index d3a42bf..ade78eb 100644
/* Get critical temperature callback functions for thermal zone */
static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal,
int *temp)
-diff --git a/include/linux/thermal.h b/include/linux/thermal.h
-index e9f2863..5c6a589 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -269,7 +269,7 @@ struct thermal_genl_event {
@@ -118,6 +112,3 @@ index e9f2863..5c6a589 100644
int (*set_emul_temp)(void *, int);
};
---
-1.7.10.4
-