lkml.org 
[lkml]   [2022]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 12/32] thermal/drivers/st: 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/st/stm_thermal.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c
    index 5fd3fb8912a6..e4ca0d504a4f 100644
    --- a/drivers/thermal/st/stm_thermal.c
    +++ b/drivers/thermal/st/stm_thermal.c
    @@ -302,9 +302,9 @@ static int stm_disable_irq(struct stm_thermal_sensor *sensor)
    return 0;
    }

    -static int stm_thermal_set_trips(void *data, int low, int high)
    +static int stm_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)
    {
    - struct stm_thermal_sensor *sensor = data;
    + struct stm_thermal_sensor *sensor = tz->devdata;
    u32 itr1, th;
    int ret;

    @@ -350,9 +350,9 @@ static int stm_thermal_set_trips(void *data, int low, int high)
    }

    /* Callback to get temperature from HW */
    -static int stm_thermal_get_temp(void *data, int *temp)
    +static int stm_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
    {
    - struct stm_thermal_sensor *sensor = data;
    + struct stm_thermal_sensor *sensor = tz->devdata;
    u32 periods;
    int freqM, ret;

    @@ -474,7 +474,7 @@ static int stm_thermal_resume(struct device *dev)
    static SIMPLE_DEV_PM_OPS(stm_thermal_pm_ops,
    stm_thermal_suspend, stm_thermal_resume);

    -static const struct thermal_zone_of_device_ops stm_tz_ops = {
    +static const struct thermal_zone_device_ops stm_tz_ops = {
    .get_temp = stm_thermal_get_temp,
    .set_trips = stm_thermal_set_trips,
    };
    @@ -539,9 +539,9 @@ static int stm_thermal_probe(struct platform_device *pdev)
    return ret;
    }

    - sensor->th_dev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0,
    - sensor,
    - &stm_tz_ops);
    + sensor->th_dev = devm_thermal_of_zone_register(&pdev->dev, 0,
    + sensor,
    + &stm_tz_ops);

    if (IS_ERR(sensor->th_dev)) {
    dev_err(&pdev->dev, "%s: thermal zone sensor registering KO\n",
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-08-01 23:25    [W:2.417 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site