diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-14 18:16:28 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-14 18:16:28 +0300 |
| commit | cfeeb7d37dea0e2359be10e4b0536d5b3c61661a (patch) | |
| tree | 4d28cd11b2bd30b944803af52b0273742e2409af /drivers/thermal/hisi_thermal.c | |
| parent | 065ca2a8c6ee601d990ea10efc71b861c5afc4fd (diff) | |
| parent | 75f74a907164eaeb1bd5334b01504a84b2b63bf5 (diff) | |
| download | linux-cfeeb7d37dea0e2359be10e4b0536d5b3c61661a.tar.xz | |
Merge back general thermal control changes for 6.4-rc1.
Diffstat (limited to 'drivers/thermal/hisi_thermal.c')
| -rw-r--r-- | drivers/thermal/hisi_thermal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 0d135b8a5b62..3f09ef8be41a 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -544,7 +544,6 @@ static int hisi_thermal_probe(struct platform_device *pdev) { struct hisi_thermal_data *data; struct device *dev = &pdev->dev; - struct resource *res; int i, ret; data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); @@ -555,8 +554,7 @@ static int hisi_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, data); data->ops = of_device_get_match_data(dev); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - data->regs = devm_ioremap_resource(dev, res); + data->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(data->regs)) return PTR_ERR(data->regs); |