thermal/drivers/mmio: 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: Daniel Lezcano <daniel.lezcano@linexp.org>
Reviewed-by: Talel Shenhar <talel@amazon.com>
Link: https://lore.kernel.org/r/20220804224349.1926752-7-daniel.lezcano@linexp.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Daniel Lezcano 2022-08-05 00:43:22 +02:00 committed by Daniel Lezcano
parent 2ff66cba5b
commit 44b5554d98

View File

@ -20,11 +20,10 @@ static u32 thermal_mmio_readb(void __iomem *mmio_base)
return readb(mmio_base); return readb(mmio_base);
} }
static int thermal_mmio_get_temperature(void *private, int *temp) static int thermal_mmio_get_temperature(struct thermal_zone_device *tz, int *temp)
{ {
int t; int t;
struct thermal_mmio *sensor = struct thermal_mmio *sensor = tz->devdata;
(struct thermal_mmio *)private;
t = sensor->read_mmio(sensor->mmio_base) & sensor->mask; t = sensor->read_mmio(sensor->mmio_base) & sensor->mask;
t *= sensor->factor; t *= sensor->factor;
@ -34,7 +33,7 @@ static int thermal_mmio_get_temperature(void *private, int *temp)
return 0; return 0;
} }
static const struct thermal_zone_of_device_ops thermal_mmio_ops = { static const struct thermal_zone_device_ops thermal_mmio_ops = {
.get_temp = thermal_mmio_get_temperature, .get_temp = thermal_mmio_get_temperature,
}; };
@ -68,10 +67,10 @@ static int thermal_mmio_probe(struct platform_device *pdev)
} }
} }
thermal_zone = devm_thermal_zone_of_sensor_register(&pdev->dev, thermal_zone = devm_thermal_of_zone_register(&pdev->dev,
0, 0,
sensor, sensor,
&thermal_mmio_ops); &thermal_mmio_ops);
if (IS_ERR(thermal_zone)) { if (IS_ERR(thermal_zone)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to register sensor (%ld)\n", "failed to register sensor (%ld)\n",
@ -79,7 +78,7 @@ static int thermal_mmio_probe(struct platform_device *pdev)
return PTR_ERR(thermal_zone); return PTR_ERR(thermal_zone);
} }
thermal_mmio_get_temperature(sensor, &temperature); thermal_mmio_get_temperature(thermal_zone, &temperature);
dev_info(&pdev->dev, dev_info(&pdev->dev,
"thermal mmio sensor %s registered, current temperature: %d\n", "thermal mmio sensor %s registered, current temperature: %d\n",
pdev->name, temperature); pdev->name, temperature);