Commit a44b5e39 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: core: Eliminate thermal_zone_trip_down() 



Since thermal_zone_set_trip_temp() is now located in the same file
as thermal_trip_crossed(), it can invoke the latter directly without
using the thermal_zone_trip_down() wrapper that has no other users.

Update thermal_zone_set_trip_temp() accordingly and drop
thermal_zone_trip_down().

No functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/1807510.VLH7GnMWUR@rjwysocki.net
parent e654a0c5

drivers/thermal/thermal_core.c

+1 −7
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ void thermal_zone_set_trip_temp(struct thermal_zone_device *tz, 
		 * are needed to compensate for the lack of it going forward.

		 */

		if (tz->temperature >= td->threshold)

			thermal_zone_trip_down(tz, td);

			thermal_trip_crossed(tz, td, thermal_get_tz_governor(tz), false);



		/*

		 * Invalidate the threshold to avoid triggering a spurious
@@ -699,12 +699,6 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, 
}

EXPORT_SYMBOL_GPL(thermal_zone_device_update);



void thermal_zone_trip_down(struct thermal_zone_device *tz,

			    struct thermal_trip_desc *td)

{

	thermal_trip_crossed(tz, td, thermal_get_tz_governor(tz), false);

}



int for_each_thermal_governor(int (*cb)(struct thermal_governor *, void *),

			      void *data)

{

drivers/thermal/thermal_core.h

+0 −2
Original line number Diff line number Diff line
@@ -273,8 +273,6 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz, int low, int high); 
int thermal_zone_trip_id(const struct thermal_zone_device *tz,

			 const struct thermal_trip *trip);

int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);

void thermal_zone_trip_down(struct thermal_zone_device *tz,

			    struct thermal_trip_desc *td);

void thermal_zone_set_trip_hyst(struct thermal_zone_device *tz,

				struct thermal_trip *trip, int hyst);