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

thermal: trip: Fold __thermal_zone_get_trip() into its caller 



Because __thermal_zone_get_trip() is only called by thermal_zone_get_trip()
now, fold the former into the latter.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/22339769.EfDdHjke4D@rjwysocki.net
parent 0728c810

drivers/thermal/thermal_trip.c

+4 −14
Original line number Diff line number Diff line
@@ -114,27 +114,17 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz) 
		dev_err(&tz->device, "Failed to set trips: %d\n", ret);

}



int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,

			    struct thermal_trip *trip)

{

	if (!tz || trip_id < 0 || trip_id >= tz->num_trips || !trip)

		return -EINVAL;



	*trip = tz->trips[trip_id].trip;

	return 0;

}

EXPORT_SYMBOL_GPL(__thermal_zone_get_trip);



int thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,

			  struct thermal_trip *trip)

{

	int ret;

	if (!tz || !trip || trip_id < 0 || trip_id >= tz->num_trips)

		return -EINVAL;



	mutex_lock(&tz->lock);

	ret = __thermal_zone_get_trip(tz, trip_id, trip);

	*trip = tz->trips[trip_id].trip;

	mutex_unlock(&tz->lock);



	return ret;

	return 0;

}

EXPORT_SYMBOL_GPL(thermal_zone_get_trip);

include/linux/thermal.h

+0 −2
Original line number Diff line number Diff line
@@ -202,8 +202,6 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev, 
}

#endif



int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,

			    struct thermal_trip *trip);

int thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,

			  struct thermal_trip *trip);

int for_each_thermal_trip(struct thermal_zone_device *tz,