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

thermal: trip: Get rid of thermal_zone_get_num_trips() 



The only existing caller of thermal_zone_get_num_trips(), which is
rcar_gen3_thermal_probe(), uses this function to put the number of
trip points into a kernel log message, but this information is also
available from the thermal sysfs interface.

For this reason, remove the thermal_zone_get_num_trips() call from
rcar_gen3_thermal_probe() and drop the former altogether.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/2636988.Lt9SDvczpP@rjwysocki.net
parent 96d81990

drivers/thermal/renesas/rcar_gen3_thermal.c

+1 −5
Original line number Diff line number Diff line
@@ -563,11 +563,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) 
		if (ret)

			goto error_unregister;



		ret = thermal_zone_get_num_trips(tsc->zone);

		if (ret < 0)

			goto error_unregister;



		dev_info(dev, "Sensor %u: Loaded %d trip points\n", i, ret);

		dev_info(dev, "Sensor %u: Loaded\n", i);

	}



	if (!priv->num_tscs) {

drivers/thermal/thermal_trip.c

+0 −6
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@ int thermal_zone_for_each_trip(struct thermal_zone_device *tz, 
}

EXPORT_SYMBOL_GPL(thermal_zone_for_each_trip);



int thermal_zone_get_num_trips(struct thermal_zone_device *tz)

{

	return tz->num_trips;

}

EXPORT_SYMBOL_GPL(thermal_zone_get_num_trips);



/**

 * thermal_zone_set_trips - Computes the next trip points for the driver

 * @tz: a pointer to a thermal zone device structure

include/linux/thermal.h

+0 −1
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ int for_each_thermal_trip(struct thermal_zone_device *tz, 
int thermal_zone_for_each_trip(struct thermal_zone_device *tz,

			       int (*cb)(struct thermal_trip *, void *),

			       void *data);

int thermal_zone_get_num_trips(struct thermal_zone_device *tz);

void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,

				struct thermal_trip *trip, int temp);