[PATCH 2/4] hwspinlock: omap: Use devm_pm_runtime_enable() helper

[Andrew Davis]

This disables runtime PM on module exit, allowing us to simplify
the probe exit path and remove callbacks. Do that here.

Signed-off-by: Andrew Davis <a...@ti.com>
---
 drivers/hwspinlock/omap_hwspinlock.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/drivers/hwspinlock/omap_hwspinlock.c 
b/drivers/hwspinlock/omap_hwspinlock.c
index cca55143d24d4..2f18ea6c05e3f 100644
--- 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,22 +104,18 @@ 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);
 
@@ -129,16 +125,12 @@ static int omap_hwspinlock_probe(struct platform_device 
*pdev)
        ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
                                                base_id, num_locks);
        if (ret)
-               goto runtime_err;
+               return ret;
 
        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 +143,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[] = {
-- 
2.39.2