hwspinlock: omap: Use devm_pm_runtime_enable() helper

This disables runtime PM on module exit automatically for us, currently
we manually disable runtime PM which can be error-prone if not done
in the right order or missed in some exit path. This also allows us
to simplify the probe exit path and remove callbacks. Do that here.

While here, as we can now return right after registering our hwspinlock,
simply return directly and remove the extra debug message.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240208165114.63148-2-afd@ti.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
index cca55143d24d4be97597892068f249aeaaa52e4f..3bd3ffab92100b2ba16f3af00d529efbed4ee2a9 100644 (file)
--- a/drivers/hwspinlock/omap_hwspinlock.c
+++ b/drivers/hwspinlock/omap_hwspinlock.c
@@ -89,10 +89,10 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
         * make sure the module is enabled and clocked before reading
         * the module SYSSTATUS register
         */
-       pm_runtime_enable(&pdev->dev);
+       devm_pm_runtime_enable(&pdev->dev);
        ret = pm_runtime_resume_and_get(&pdev->dev);
        if (ret < 0)
-               goto runtime_err;
+               return ret;
 
        /* Determine number of locks */
        i = readl(io_base + SYSSTATUS_OFFSET);
@@ -104,41 +104,26 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
         */
        ret = pm_runtime_put(&pdev->dev);
        if (ret < 0)
-               goto runtime_err;
+               return ret;
 
        /* one of the four lsb's must be set, and nothing else */
-       if (hweight_long(i & 0xf) != 1 || i > 8) {
-               ret = -EINVAL;
-               goto runtime_err;
-       }
+       if (hweight_long(i & 0xf) != 1 || i > 8)
+               return -EINVAL;
 
        num_locks = i * 32; /* actual number of locks in this device */
 
        bank = devm_kzalloc(&pdev->dev, struct_size(bank, lock, num_locks),
                            GFP_KERNEL);
-       if (!bank) {
-               ret = -ENOMEM;
-               goto runtime_err;
-       }
+       if (!bank)
+               return -ENOMEM;
 
        platform_set_drvdata(pdev, bank);
 
        for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
                hwlock->priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
 
-       ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
+       return hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
                                                base_id, num_locks);
-       if (ret)
-               goto runtime_err;
-
-       dev_dbg(&pdev->dev, "Registered %d locks with HwSpinlock core\n",
-               num_locks);
-
-       return 0;
-
-runtime_err:
-       pm_runtime_disable(&pdev->dev);
-       return ret;
 }
 
 static void omap_hwspinlock_remove(struct platform_device *pdev)
@@ -151,8 +136,6 @@ static void omap_hwspinlock_remove(struct platform_device *pdev)
                dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
                return;
        }
-
-       pm_runtime_disable(&pdev->dev);
 }
 
 static const struct of_device_id omap_hwspinlock_of_match[] = {