Commit 453a55a9 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Daniel Lezcano
Browse files

thermal/of: Use generic thermal_zone_get_trip() function 



The thermal framework gives the possibility to register the trip
points with the thermal zone. When that is done, no get_trip_* ops are
needed and they can be removed.

The thermal OF code uses the thermal_zone_device_register_with_trips()
function. It builds the trips array and pass it to the register
function. That means the get_trip_* ops are duplicated with what does
already the core code.

Remove them.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20221003092602.1323944-6-daniel.lezcano@linaro.org
parent 7f725a23

drivers/thermal/thermal_of.c

+0 −36
Original line number Diff line number Diff line
@@ -71,39 +71,6 @@ of_thermal_get_trip_points(struct thermal_zone_device *tz) 
}

EXPORT_SYMBOL_GPL(of_thermal_get_trip_points);



static int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,

				    enum thermal_trip_type *type)

{

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

		return -EDOM;



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



	return 0;

}



static int of_thermal_get_trip_temp(struct thermal_zone_device *tz, int trip,

				    int *temp)

{

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

		return -EDOM;



	*temp = tz->trips[trip].temperature;



	return 0;

}



static int of_thermal_get_trip_hyst(struct thermal_zone_device *tz, int trip,

				    int *hyst)

{

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

		return -EDOM;



	*hyst = tz->trips[trip].hysteresis;



	return 0;

}



static int of_thermal_set_trip_hyst(struct thermal_zone_device *tz, int trip,

				    int hyst)

{
@@ -628,9 +595,6 @@ struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor, 
		goto out_kfree_trips;

	}



	of_ops->get_trip_type = of_ops->get_trip_type ? : of_thermal_get_trip_type;

	of_ops->get_trip_temp = of_ops->get_trip_temp ? : of_thermal_get_trip_temp;

	of_ops->get_trip_hyst = of_ops->get_trip_hyst ? : of_thermal_get_trip_hyst;

	of_ops->set_trip_hyst = of_ops->set_trip_hyst ? : of_thermal_set_trip_hyst;

	of_ops->get_crit_temp = of_ops->get_crit_temp ? : of_thermal_get_crit_temp;

	of_ops->bind = thermal_of_bind;