projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'lsk-v4.4-16.07-android'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
thermal
/
ti-soc-thermal
/
ti-thermal-common.c
diff --git
a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index b213a12222956185677e11208224514a4468217c..8efcdfde4ab254cb9a6a79c47427690d7aebc933 100644
(file)
--- a/
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@
-239,7
+239,7
@@
static int ti_thermal_get_trip_temp(struct thermal_zone_device *thermal,
return 0;
}
return 0;
}
-static int __ti_thermal_get_trend(void *p,
long
*trend)
+static int __ti_thermal_get_trend(void *p,
int trip, enum thermal_trend
*trend)
{
struct ti_thermal_data *data = p;
struct ti_bandgap *bgp;
{
struct ti_thermal_data *data = p;
struct ti_bandgap *bgp;
@@
-252,22
+252,6
@@
static int __ti_thermal_get_trend(void *p, long *trend)
if (ret)
return ret;
if (ret)
return ret;
- *trend = tr;
-
- return 0;
-}
-
-/* Get the temperature trend callback functions for thermal zone */
-static int ti_thermal_get_trend(struct thermal_zone_device *thermal,
- int trip, enum thermal_trend *trend)
-{
- int ret;
- long tr;
-
- ret = __ti_thermal_get_trend(thermal->devdata, &tr);
- if (ret)
- return ret;
-
if (tr > 0)
*trend = THERMAL_TREND_RAISING;
else if (tr < 0)
if (tr > 0)
*trend = THERMAL_TREND_RAISING;
else if (tr < 0)
@@
-278,6
+262,13
@@
static int ti_thermal_get_trend(struct thermal_zone_device *thermal,
return 0;
}
return 0;
}
+/* Get the temperature trend callback functions for thermal zone */
+static int ti_thermal_get_trend(struct thermal_zone_device *thermal,
+ int trip, enum thermal_trend *trend)
+{
+ return __ti_thermal_get_trend(thermal->devdata, trip, trend);
+}
+
/* Get critical temperature callback functions for thermal zone */
static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal,
int *temp)
/* Get critical temperature callback functions for thermal zone */
static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal,
int *temp)