diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-01-27 17:55:23 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-01-27 17:55:23 +0300 |
| commit | 79b2027097dd3046ff95a2701af441405f1ff298 (patch) | |
| tree | 5db999f6a71d652b2e3a64150ab96a987d38421f /drivers/thermal/thermal_mmio.c | |
| parent | acd7e9ee57c880b99671dd99680cb707b7b5b0ee (diff) | |
| parent | 02be605946b64df6d328811eb2488f7a245a5206 (diff) | |
| download | linux-79b2027097dd3046ff95a2701af441405f1ff298.tar.xz | |
Merge back thermal control material for 6.3.
Diffstat (limited to 'drivers/thermal/thermal_mmio.c')
| -rw-r--r-- | drivers/thermal/thermal_mmio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/thermal/thermal_mmio.c b/drivers/thermal/thermal_mmio.c index 39c921415989..ea616731066c 100644 --- a/drivers/thermal/thermal_mmio.c +++ b/drivers/thermal/thermal_mmio.c @@ -39,7 +39,6 @@ static const struct thermal_zone_device_ops thermal_mmio_ops = { static int thermal_mmio_probe(struct platform_device *pdev) { - struct resource *resource; struct thermal_mmio *sensor; int (*sensor_init_func)(struct platform_device *pdev, struct thermal_mmio *sensor); @@ -51,8 +50,7 @@ static int thermal_mmio_probe(struct platform_device *pdev) if (!sensor) return -ENOMEM; - resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); - sensor->mmio_base = devm_ioremap_resource(&pdev->dev, resource); + sensor->mmio_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); if (IS_ERR(sensor->mmio_base)) return PTR_ERR(sensor->mmio_base); |