Use devm_pm_runtime_set_active_enabled to replace
pm_runtime_set_active() + pm_runtime_enable() and drop the out_pm
error label and now-unnecessary remove function.
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
---
drivers/spi/spi-meson-spifc.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/drivers/spi/spi-meson-spifc.c b/drivers/spi/spi-meson-spifc.c
index e36aa94bbdae..f67a0d10b602 100644
--- a/drivers/spi/spi-meson-spifc.c
+++ b/drivers/spi/spi-meson-spifc.c
@@ -325,27 +325,15 @@ static int meson_spifc_probe(struct platform_device *pdev)
meson_spifc_hw_init(spifc);
- pm_runtime_set_active(spifc->dev);
- pm_runtime_enable(spifc->dev);
+ ret = devm_pm_runtime_set_active_enabled(spifc->dev);
+ if (ret)
+ return dev_err_probe(spifc->dev, ret, "failed to set runtime PM\n");
ret = devm_spi_register_controller(spifc->dev, host);
- if (ret) {
- dev_err(spifc->dev, "failed to register spi host\n");
- goto out_pm;
- }
+ if (ret)
+ return dev_err_probe(spifc->dev, ret, "failed to register spi host\n");
return 0;
-out_pm:
- pm_runtime_disable(spifc->dev);
-
- return ret;
-}
-
-static void meson_spifc_remove(struct platform_device *pdev)
-{
- pm_runtime_get_sync(&pdev->dev);
- pm_runtime_disable(&pdev->dev);
- pm_runtime_put_noidle(&pdev->dev);
}
#ifdef CONFIG_PM_SLEEP
@@ -423,7 +411,6 @@ MODULE_DEVICE_TABLE(of, meson_spifc_dt_match);
static struct platform_driver meson_spifc_driver = {
.probe = meson_spifc_probe,
- .remove = meson_spifc_remove,
.driver = {
.name = "meson-spifc",
.of_match_table = of_match_ptr(meson_spifc_dt_match),
---
base-commit: 3fe08b9796f36ef437ab9328e7dd1e5ff2d66603
change-id: 20260722-spifc-336fbde9511b
Best regards,
--
Felix Gu <ustc.gu@gmail.com>