diff options
author | Lukasz Majewski <l.majewski@samsung.com> | 2014-12-08 12:04:17 -0500 |
---|---|---|
committer | Eduardo Valentin <edubezval@gmail.com> | 2014-12-08 14:38:32 -0500 |
commit | 08dab66ec8431a1f744596cfc9f5fb659b623835 (patch) | |
tree | 325ba73d13f1e4b6bd7e2a598e0d2e5945c4eec5 /drivers/thermal | |
parent | e920f9b632a687834de5a78c60ac5c4c62327b1d (diff) |
thermal: of: Extend of-thermal.c to provide number of trip points
This patch extends the of-thermal.c to provide information about number of
available trip points.
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r-- | drivers/thermal/of-thermal.c | 21 | ||||
-rw-r--r-- | drivers/thermal/thermal_core.h | 5 |
2 files changed, 26 insertions, 0 deletions
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index b7982f0a6eaf..7facd23b1d9b 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c | |||
@@ -112,6 +112,27 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz, | |||
112 | return data->ops->get_temp(data->sensor_data, temp); | 112 | return data->ops->get_temp(data->sensor_data, temp); |
113 | } | 113 | } |
114 | 114 | ||
115 | /** | ||
116 | * of_thermal_get_ntrips - function to export number of available trip | ||
117 | * points. | ||
118 | * @tz: pointer to a thermal zone | ||
119 | * | ||
120 | * This function is a globally visible wrapper to get number of trip points | ||
121 | * stored in the local struct __thermal_zone | ||
122 | * | ||
123 | * Return: number of available trip points, -ENODEV when data not available | ||
124 | */ | ||
125 | int of_thermal_get_ntrips(struct thermal_zone_device *tz) | ||
126 | { | ||
127 | struct __thermal_zone *data = tz->devdata; | ||
128 | |||
129 | if (!data || IS_ERR(data)) | ||
130 | return -ENODEV; | ||
131 | |||
132 | return data->ntrips; | ||
133 | } | ||
134 | EXPORT_SYMBOL_GPL(of_thermal_get_ntrips); | ||
135 | |||
115 | static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, | 136 | static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, |
116 | enum thermal_trend *trend) | 137 | enum thermal_trend *trend) |
117 | { | 138 | { |
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index d15d243de27a..1cc5041b7a26 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h | |||
@@ -89,9 +89,14 @@ static inline void thermal_gov_user_space_unregister(void) {} | |||
89 | #ifdef CONFIG_THERMAL_OF | 89 | #ifdef CONFIG_THERMAL_OF |
90 | int of_parse_thermal_zones(void); | 90 | int of_parse_thermal_zones(void); |
91 | void of_thermal_destroy_zones(void); | 91 | void of_thermal_destroy_zones(void); |
92 | int of_thermal_get_ntrips(struct thermal_zone_device *); | ||
92 | #else | 93 | #else |
93 | static inline int of_parse_thermal_zones(void) { return 0; } | 94 | static inline int of_parse_thermal_zones(void) { return 0; } |
94 | static inline void of_thermal_destroy_zones(void) { } | 95 | static inline void of_thermal_destroy_zones(void) { } |
96 | static inline int of_thermal_get_ntrips(struct thermal_zone_device *tz) | ||
97 | { | ||
98 | return 0; | ||
99 | } | ||
95 | #endif | 100 | #endif |
96 | 101 | ||
97 | #endif /* __THERMAL_CORE_H__ */ | 102 | #endif /* __THERMAL_CORE_H__ */ |