diff options
author | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 11:38:34 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 11:38:34 +0800 |
commit | c89d99546dc5b076ccd6692c48ada9a92820a4ac (patch) | |
tree | 30788930f8c3fca80c0e5d8a377786d4a4a863bd /drivers/thermal/thermal_core.h | |
parent | 5a530ff0d88a366736ae4d1021e7358b52e55756 (diff) | |
parent | 9c1e4550b5cbe17ff68ce631356190ef9a565386 (diff) | |
download | op-kernel-dev-c89d99546dc5b076ccd6692c48ada9a92820a4ac.zip op-kernel-dev-c89d99546dc5b076ccd6692c48ada9a92820a4ac.tar.gz |
Merge branch 'eduardo-soc-thermal' into thermal-soc
Diffstat (limited to 'drivers/thermal/thermal_core.h')
-rw-r--r-- | drivers/thermal/thermal_core.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index d15d243..9083e75 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -89,9 +89,27 @@ static inline void thermal_gov_user_space_unregister(void) {} #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones(void); void of_thermal_destroy_zones(void); +int of_thermal_get_ntrips(struct thermal_zone_device *); +bool of_thermal_is_trip_valid(struct thermal_zone_device *, int); +const struct thermal_trip * const +of_thermal_get_trip_points(struct thermal_zone_device *); #else static inline int of_parse_thermal_zones(void) { return 0; } static inline void of_thermal_destroy_zones(void) { } +static inline int of_thermal_get_ntrips(struct thermal_zone_device *tz) +{ + return 0; +} +static inline bool of_thermal_is_trip_valid(struct thermal_zone_device *tz, + int trip) +{ + return 0; +} +static inline const struct thermal_trip * const +of_thermal_get_trip_points(struct thermal_zone_device *tz) +{ + return NULL; +} #endif #endif /* __THERMAL_CORE_H__ */ |