lkml.org 
[lkml]   [2022]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 09/33] thermal/drivers/sprd: 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/sprd_thermal.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/thermal/sprd_thermal.c b/drivers/thermal/sprd_thermal.c
    index fff80fc18002..ac884514f116 100644
    --- a/drivers/thermal/sprd_thermal.c
    +++ b/drivers/thermal/sprd_thermal.c
    @@ -204,9 +204,9 @@ static int sprd_thm_temp_to_rawdata(int temp, struct sprd_thermal_sensor *sen)
    return clamp(val, val, (u32)(SPRD_THM_RAW_DATA_HIGH - 1));
    }

    -static int sprd_thm_read_temp(void *devdata, int *temp)
    +static int sprd_thm_read_temp(struct thermal_zone_device *tz, int *temp)
    {
    - struct sprd_thermal_sensor *sen = devdata;
    + struct sprd_thermal_sensor *sen = tz->devdata;
    u32 data;

    data = readl(sen->data->base + SPRD_THM_TEMP(sen->id)) &
    @@ -217,7 +217,7 @@ static int sprd_thm_read_temp(void *devdata, int *temp)
    return 0;
    }

    -static const struct thermal_zone_of_device_ops sprd_thm_ops = {
    +static const struct thermal_zone_device_ops sprd_thm_ops = {
    .get_temp = sprd_thm_read_temp,
    };

    @@ -408,10 +408,10 @@ static int sprd_thm_probe(struct platform_device *pdev)

    sprd_thm_sensor_init(thm, sen);

    - sen->tzd = devm_thermal_zone_of_sensor_register(sen->dev,
    - sen->id,
    - sen,
    - &sprd_thm_ops);
    + sen->tzd = devm_thermal_of_zone_register(sen->dev,
    + sen->id,
    + sen,
    + &sprd_thm_ops);
    if (IS_ERR(sen->tzd)) {
    dev_err(&pdev->dev, "register thermal zone failed %d\n",
    sen->id);
    @@ -523,8 +523,8 @@ static int sprd_thm_remove(struct platform_device *pdev)

    for (i = 0; i < thm->nr_sensors; i++) {
    sprd_thm_toggle_sensor(thm->sensor[i], false);
    - devm_thermal_zone_of_sensor_unregister(&pdev->dev,
    - thm->sensor[i]->tzd);
    + devm_thermal_of_zone_unregister(&pdev->dev,
    + thm->sensor[i]->tzd);
    }

    clk_disable_unprepare(thm->clk);
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-08-05 00:53    [W:4.185 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site