lkml.org 
[lkml]   [2022]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 16/32] thermal/drivers/imx: Switch to new of API
    Date
    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>
    ---
    drivers/thermal/imx8mm_thermal.c | 14 +++++++-------
    drivers/thermal/imx_sc_thermal.c | 14 +++++++-------
    2 files changed, 14 insertions(+), 14 deletions(-)

    diff --git a/drivers/thermal/imx8mm_thermal.c b/drivers/thermal/imx8mm_thermal.c
    index af666bd9e8d4..e2c2673025a7 100644
    --- a/drivers/thermal/imx8mm_thermal.c
    +++ b/drivers/thermal/imx8mm_thermal.c
    @@ -96,15 +96,15 @@ static int imx8mp_tmu_get_temp(void *data, int *temp)
    return 0;
    }

    -static int tmu_get_temp(void *data, int *temp)
    +static int tmu_get_temp(struct thermal_zone_device *tz, int *temp)
    {
    - struct tmu_sensor *sensor = data;
    + struct tmu_sensor *sensor = tz->devdata;
    struct imx8mm_tmu *tmu = sensor->priv;

    - return tmu->socdata->get_temp(data, temp);
    + return tmu->socdata->get_temp(sensor, temp);
    }

    -static struct thermal_zone_of_device_ops tmu_tz_ops = {
    +static const struct thermal_zone_device_ops tmu_tz_ops = {
    .get_temp = tmu_get_temp,
    };

    @@ -165,9 +165,9 @@ static int imx8mm_tmu_probe(struct platform_device *pdev)
    for (i = 0; i < data->num_sensors; i++) {
    tmu->sensors[i].priv = tmu;
    tmu->sensors[i].tzd =
    - devm_thermal_zone_of_sensor_register(&pdev->dev, i,
    - &tmu->sensors[i],
    - &tmu_tz_ops);
    + devm_thermal_of_zone_register(&pdev->dev, i,
    + &tmu->sensors[i],
    + &tmu_tz_ops);
    if (IS_ERR(tmu->sensors[i].tzd)) {
    ret = PTR_ERR(tmu->sensors[i].tzd);
    dev_err(&pdev->dev,
    diff --git a/drivers/thermal/imx_sc_thermal.c b/drivers/thermal/imx_sc_thermal.c
    index 331a241eb0ef..10bfa6507eb4 100644
    --- a/drivers/thermal/imx_sc_thermal.c
    +++ b/drivers/thermal/imx_sc_thermal.c
    @@ -43,11 +43,11 @@ struct imx_sc_msg_misc_get_temp {
    } data;
    } __packed __aligned(4);

    -static int imx_sc_thermal_get_temp(void *data, int *temp)
    +static int imx_sc_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
    {
    struct imx_sc_msg_misc_get_temp msg;
    struct imx_sc_rpc_msg *hdr = &msg.hdr;
    - struct imx_sc_sensor *sensor = data;
    + struct imx_sc_sensor *sensor = tz->devdata;
    int ret;

    msg.data.req.resource_id = sensor->resource_id;
    @@ -70,7 +70,7 @@ static int imx_sc_thermal_get_temp(void *data, int *temp)
    return 0;
    }

    -static const struct thermal_zone_of_device_ops imx_sc_thermal_ops = {
    +static const struct thermal_zone_device_ops imx_sc_thermal_ops = {
    .get_temp = imx_sc_thermal_get_temp,
    };

    @@ -109,10 +109,10 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)
    break;
    }

    - sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev,
    - sensor->resource_id,
    - sensor,
    - &imx_sc_thermal_ops);
    + sensor->tzd = devm_thermal_of_zone_register(&pdev->dev,
    + sensor->resource_id,
    + sensor,
    + &imx_sc_thermal_ops);
    if (IS_ERR(sensor->tzd)) {
    dev_err(&pdev->dev, "failed to register thermal zone\n");
    ret = PTR_ERR(sensor->tzd);
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-07-27 23:05    [W:4.141 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site