hwspinlock: sirf: Remove redundant PM runtime functions

Since the hwspinlock core has changed the PM runtime to be optional, and
the SIRF hardware spinlock has no pm runtime requirement, thus remove
these redundant PM runtime functions.

Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
Link: https://lore.kernel.org/r/c921e391aa2a652d8d6ae0e4041202cec9d917e7.1578453662.git.baolin.wang7@gmail.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/hwspinlock/sirf_hwspinlock.c b/drivers/hwspinlock/sirf_hwspinlock.c
index 8cb5fd41f236bc83b83c80622ab7a7987fbb6d66..d62462e1f62b77756fdeff0f9e14eca4f2b4d273 100644 (file)
--- a/drivers/hwspinlock/sirf_hwspinlock.c
+++ b/drivers/hwspinlock/sirf_hwspinlock.c
@@ -9,7 +9,6 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/io.h>
-#include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/hwspinlock.h>
@@ -56,7 +55,7 @@ static int sirf_hwspinlock_probe(struct platform_device *pdev)
 {
        struct sirf_hwspinlock *hwspin;
        struct hwspinlock *hwlock;
-       int idx, ret;
+       int idx;
 
        if (!pdev->dev.of_node)
                return -ENODEV;
@@ -80,20 +79,9 @@ static int sirf_hwspinlock_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, hwspin);
 
-       pm_runtime_enable(&pdev->dev);
-
-       ret = hwspin_lock_register(&hwspin->bank, &pdev->dev,
-                                  &sirf_hwspinlock_ops, 0,
-                                  HW_SPINLOCK_NUMBER);
-       if (ret)
-               goto reg_failed;
-
-       return 0;
-
-reg_failed:
-       pm_runtime_disable(&pdev->dev);
-
-       return ret;
+       return hwspin_lock_register(&hwspin->bank, &pdev->dev,
+                                   &sirf_hwspinlock_ops, 0,
+                                   HW_SPINLOCK_NUMBER);
 }
 
 static int sirf_hwspinlock_remove(struct platform_device *pdev)
@@ -107,8 +95,6 @@ static int sirf_hwspinlock_remove(struct platform_device *pdev)
                return ret;
        }
 
-       pm_runtime_disable(&pdev->dev);
-
        return 0;
 }