diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-12 20:08:28 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-12 20:08:28 +0200 |
| commit | d3bff6277087c77a12ae6458d6da44d725f6fbaf (patch) | |
| tree | 36f242a3ee5c09974f4e946ada3ec685893f0a9f /drivers/thermal/k3_bandgap.c | |
| parent | c99626092efca3061b387043d4a7399bf75fbdd5 (diff) | |
| parent | eea6c26207255461c1d5b59d74ee460442113ece (diff) | |
Merge branch 'thermal-misc'
Merge thermal control changes related to switching over platform drivers
to using void remove callbacks.
* thermal-misc: (31 commits)
thermal: amlogic: Convert to platform remove callback returning void
thermal: uniphier: Convert to platform remove callback returning void
thermal: ti-bandgap: Convert to platform remove callback returning void
thermal: tegra-bpmp: Convert to platform remove callback returning void
thermal: soctherm: Convert to platform remove callback returning void
thermal: stm: Convert to platform remove callback returning void
thermal: sprd: Convert to platform remove callback returning void
thermal: spear: Convert to platform remove callback returning void
thermal: exynos_tmu: Convert to platform remove callback returning void
thermal: rzg2l: Convert to platform remove callback returning void
thermal: rockchip: Convert to platform remove callback returning void
thermal: rcar: Convert to platform remove callback returning void
thermal: rcar_gen3: Convert to platform remove callback returning void
thermal: tsens: Convert to platform remove callback returning void
thermal: lvts: Convert to platform remove callback returning void
thermal: kirkwood: Convert to platform remove callback returning void
thermal: k3_j72xx_bandgap: Convert to platform remove callback returning void
thermal: k3_bandgap: Convert to platform remove callback returning void
thermal: int3406: Convert to platform remove callback returning void
thermal: int3403: Convert to platform remove callback returning void
...
Diffstat (limited to 'drivers/thermal/k3_bandgap.c')
| -rw-r--r-- | drivers/thermal/k3_bandgap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/thermal/k3_bandgap.c b/drivers/thermal/k3_bandgap.c index 4a918c1e92f9..e88192d2afea 100644 --- a/drivers/thermal/k3_bandgap.c +++ b/drivers/thermal/k3_bandgap.c @@ -235,12 +235,10 @@ err_alloc: return ret; } -static int k3_bandgap_remove(struct platform_device *pdev) +static void k3_bandgap_remove(struct platform_device *pdev) { pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); - - return 0; } static const struct of_device_id of_k3_bandgap_match[] = { @@ -253,7 +251,7 @@ MODULE_DEVICE_TABLE(of, of_k3_bandgap_match); static struct platform_driver k3_bandgap_sensor_driver = { .probe = k3_bandgap_probe, - .remove = k3_bandgap_remove, + .remove_new = k3_bandgap_remove, .driver = { .name = "k3-soc-thermal", .of_match_table = of_k3_bandgap_match, |