On 2022/08/05 7:43, Daniel Lezcano wrote:
> 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: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> drivers/thermal/uniphier_thermal.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/thermal/uniphier_thermal.c
> b/drivers/thermal/uniphier_thermal.c
> index 4cae5561a2a3..4111d99ef50e 100644
> --- a/drivers/thermal/uniphier_thermal.c
> +++ b/drivers/thermal/uniphier_thermal.c
> @@ -187,9 +187,9 @@ static void uniphier_tm_disable_sensor(struct
> uniphier_tm_dev *tdev)
> usleep_range(1000, 2000); /* The spec note says at least 1ms
> */
> }
>
> -static int uniphier_tm_get_temp(void *data, int *out_temp)
> +static int uniphier_tm_get_temp(struct thermal_zone_device *tz, int
> *out_temp)
> {
> - struct uniphier_tm_dev *tdev = data;
> + struct uniphier_tm_dev *tdev = tz->devdata;
> struct regmap *map = tdev->regmap;
> int ret;
> u32 temp;
> @@ -204,7 +204,7 @@ static int uniphier_tm_get_temp(void *data, int
> *out_temp)
> return 0;
> }
>
> -static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops =
> {
> +static const struct thermal_zone_device_ops uniphier_of_thermal_ops = {
> .get_temp = uniphier_tm_get_temp,
> };
>
> @@ -289,8 +289,8 @@ static int uniphier_tm_probe(struct platform_device
> *pdev)
>
> platform_set_drvdata(pdev, tdev);
>
> - tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> - &uniphier_of_thermal_ops);
> + tdev->tz_dev = devm_thermal_of_zone_register(dev, 0, tdev,
> +
> &uniphier_of_thermal_ops);
> if (IS_ERR(tdev->tz_dev)) {
> dev_err(dev, "failed to register sensor device\n");
> return PTR_ERR(tdev->tz_dev);
>
---
Best Regards
Kunihiko Hayashi