From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

The __thermal_zone_get_trip() header in drivers/thermal/thermal_core.h
is redundant, because there is one already in thermal.h, so drop it.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/thermal/thermal_core.h |    2 --
 1 file changed, 2 deletions(-)

Index: linux-pm/drivers/thermal/thermal_core.h
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.h
+++ linux-pm/drivers/thermal/thermal_core.h
@@ -120,8 +120,6 @@ void __thermal_zone_device_update(struct
 	for (__trip = __tz->trips; __trip - __tz->trips < __tz->num_trips; __trip++)
 
 void __thermal_zone_set_trips(struct thermal_zone_device *tz);
-int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
-			    struct thermal_trip *trip);
 int thermal_zone_trip_id(struct thermal_zone_device *tz,
 			 const struct thermal_trip *trip);
 void thermal_zone_trip_updated(struct thermal_zone_device *tz,

On 04/12/2023 20:36, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> The __thermal_zone_get_trip() header in drivers/thermal/thermal_core.h
> is redundant, because there is one already in thermal.h, so drop it.
> 
> No functional impact.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

On Mon, Dec 4, 2023 at 8:36 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> The __thermal_zone_get_trip() header in drivers/thermal/thermal_core.h
> is redundant, because there is one already in thermal.h, so drop it.
>
> No functional impact.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

From the lack of comments I gather that this change is fine with
everyone, so I'm going to queue it up for 6.8.

Thanks!

> ---
>  drivers/thermal/thermal_core.h |    2 --
>  1 file changed, 2 deletions(-)
>
> Index: linux-pm/drivers/thermal/thermal_core.h
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_core.h
> +++ linux-pm/drivers/thermal/thermal_core.h
> @@ -120,8 +120,6 @@ void __thermal_zone_device_update(struct
>         for (__trip = __tz->trips; __trip - __tz->trips < __tz->num_trips; __trip++)
>
>  void __thermal_zone_set_trips(struct thermal_zone_device *tz);
> -int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
> -                           struct thermal_trip *trip);
>  int thermal_zone_trip_id(struct thermal_zone_device *tz,
>                          const struct thermal_trip *trip);
>  void thermal_zone_trip_updated(struct thermal_zone_device *tz,
>
>
>
>