@@ -140,13 +140,8 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,
/* device tree support */
#ifdef CONFIG_THERMAL_OF
-int of_thermal_get_ntrips(struct thermal_zone_device *);
bool of_thermal_is_trip_valid(struct thermal_zone_device *, int);
#else
-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)
{
@@ -20,22 +20,6 @@
#include "thermal_core.h"
/**
- * of_thermal_get_ntrips - function to export number of available trip
- * points.
- * @tz: pointer to a thermal zone
- *
- * This function is a globally visible wrapper to get number of trip points
- * stored in the local struct __thermal_zone
- *
- * Return: number of available trip points, -ENODEV when data not available
- */
-int of_thermal_get_ntrips(struct thermal_zone_device *tz)
-{
- return tz->num_trips;
-}
-EXPORT_SYMBOL_GPL(of_thermal_get_ntrips);
-
-/**
* of_thermal_is_trip_valid - function to check if trip point is valid
*
* @tz: pointer to a thermal zone
The following commit has been merged into the thermal/next branch of thermal: Commit-ID: a16eb9df9322755d7222a51b244e93357560a66a Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//a16eb9df9322755d7222a51b244e93357560a66a Author: Daniel Lezcano <daniel.lezcano@linaro.org> AuthorDate: Mon, 03 Oct 2022 11:25:49 +02:00 Committer: Daniel Lezcano <daniel.lezcano@kernel.org> CommitterDate: Thu, 08 Dec 2022 14:30:42 +01:00 thermal/of: Remove of_thermal_get_ntrips() The thermal OF code uses the generic trip points to initialize the thermal zone. Consequently thermal_zone_get_num_trips() can be used and the of_thermal_get_ntrips() is no longer needed. Remove it. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20221003092602.1323944-17-daniel.lezcano@linaro.org --- drivers/thermal/thermal_core.h | 5 ----- drivers/thermal/thermal_of.c | 16 ---------------- 2 files changed, 21 deletions(-)