Commit e4a1150e authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Daniel Lezcano
Browse files

thermal/drivers/armada: Switch to new of API 



The thermal OF code has a new API allowing to migrate the OF
initialization to a simpler approach. The ops are no longer device
tree specific and are the generic ones provided by the core code.

Convert the ops to the thermal_zone_device_ops format and use the new
API to register the thermal zone with these generic ops.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linexp.org>
Link: https://lore.kernel.org/r/20220804224349.1926752-15-daniel.lezcano@linexp.org


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 1240fd65

drivers/thermal/armada_thermal.c

+6 −6
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ static struct thermal_zone_device_ops legacy_ops = { 
	.get_temp = armada_get_temp_legacy,

};



static int armada_get_temp(void *_sensor, int *temp)

static int armada_get_temp(struct thermal_zone_device *tz, int *temp)

{

	struct armada_thermal_sensor *sensor = _sensor;

	struct armada_thermal_sensor *sensor = tz->devdata;

	struct armada_thermal_priv *priv = sensor->priv;

	int ret;
@@ -450,7 +450,7 @@ static int armada_get_temp(void *_sensor, int *temp) 
	return ret;

}



static const struct thermal_zone_of_device_ops of_ops = {

static const struct thermal_zone_device_ops of_ops = {

	.get_temp = armada_get_temp,

};
@@ -928,7 +928,7 @@ static int armada_thermal_probe(struct platform_device *pdev) 
		/* Register the sensor */

		sensor->priv = priv;

		sensor->id = sensor_id;

		tz = devm_thermal_zone_of_sensor_register(&pdev->dev,

		tz = devm_thermal_of_zone_register(&pdev->dev,

						   sensor->id, sensor,

						   &of_ops);

		if (IS_ERR(tz)) {