Merge tag 'berlin-fixes-for-3.19-1' of git://git.infradead.org/users/hesselba/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / thermal / thermal_core.h

diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index d15d243de27a7f9386e37302084a8574566c13aa..9083e75206236c1953e4ad5d7858fbc5f164fad0 100644 (file)
--- 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__ */