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 06/33] thermal/drivers/mmio: 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>
    Reviewed-by: Talel Shenhar <talel@amazon.com>
    ---
    drivers/thermal/thermal_mmio.c | 17 ++++++++---------
    1 file changed, 8 insertions(+), 9 deletions(-)

    diff --git a/drivers/thermal/thermal_mmio.c b/drivers/thermal/thermal_mmio.c
    index 360b0dfdc3b0..1bf1a16533da 100644
    --- a/drivers/thermal/thermal_mmio.c
    +++ b/drivers/thermal/thermal_mmio.c
    @@ -20,11 +20,10 @@ static u32 thermal_mmio_readb(void __iomem *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;
    - struct thermal_mmio *sensor =
    - (struct thermal_mmio *)private;
    + struct thermal_mmio *sensor = tz->devdata;

    t = sensor->read_mmio(sensor->mmio_base) & sensor->mask;
    t *= sensor->factor;
    @@ -34,7 +33,7 @@ static int thermal_mmio_get_temperature(void *private, int *temp)
    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,
    };

    @@ -68,10 +67,10 @@ static int thermal_mmio_probe(struct platform_device *pdev)
    }
    }

    - thermal_zone = devm_thermal_zone_of_sensor_register(&pdev->dev,
    - 0,
    - sensor,
    - &thermal_mmio_ops);
    + thermal_zone = devm_thermal_of_zone_register(&pdev->dev,
    + 0,
    + sensor,
    + &thermal_mmio_ops);
    if (IS_ERR(thermal_zone)) {
    dev_err(&pdev->dev,
    "failed to register sensor (%ld)\n",
    @@ -79,7 +78,7 @@ static int thermal_mmio_probe(struct platform_device *pdev)
    return PTR_ERR(thermal_zone);
    }

    - thermal_mmio_get_temperature(sensor, &temperature);
    + thermal_mmio_get_temperature(thermal_zone, &temperature);
    dev_info(&pdev->dev,
    "thermal mmio sensor %s registered, current temperature: %d\n",
    pdev->name, temperature);
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-08-05 00:52    [W:3.373 / U:0.704 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site