2020-01-08 03:25:11

by Baolin Wang

Subject: [PATCH RESEND 0/3] Some improvements for SIRF hwspinlock

This patch set did some improvements for the SIRF hwspinlock driver,
including changing to use devm_xxx APIs and removing some redundant
pm runtime functions.

Baolin Wang (3):
hwspinlock: sirf: Change to use devm_platform_ioremap_resource()
hwspinlock: sirf: Remove redundant PM runtime functions
hwspinlock: sirf: Use devm_hwspin_lock_register() to register hwlock
controller

drivers/hwspinlock/sirf_hwspinlock.c | 46 ++++++----------------------------
1 file changed, 7 insertions(+), 39 deletions(-)

--
1.7.9.5

2020-01-08 03:25:26

by Baolin Wang

Subject: [PATCH RESEND 2/3] 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 <[email protected]>
---
drivers/hwspinlock/sirf_hwspinlock.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/drivers/hwspinlock/sirf_hwspinlock.c b/drivers/hwspinlock/sirf_hwspinlock.c
index 8cb5fd4..d62462e 100644
--- 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;
}

--
1.7.9.5

2020-01-08 03:26:33

by Baolin Wang

Subject: [PATCH RESEND 3/3] hwspinlock: sirf: Use devm_hwspin_lock_register() to register hwlock controller

Use devm_hwspin_lock_register() to register the hwlock controller instead of
unregistering the hwlock controller explicitly when removing the device.

Signed-off-by: Baolin Wang <[email protected]>
---
drivers/hwspinlock/sirf_hwspinlock.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/drivers/hwspinlock/sirf_hwspinlock.c b/drivers/hwspinlock/sirf_hwspinlock.c
index d62462e..823d3c4 100644
--- a/drivers/hwspinlock/sirf_hwspinlock.c
+++ b/drivers/hwspinlock/sirf_hwspinlock.c
@@ -79,23 +79,9 @@ static int sirf_hwspinlock_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, hwspin);

- return hwspin_lock_register(&hwspin->bank, &pdev->dev,
- &sirf_hwspinlock_ops, 0,
- HW_SPINLOCK_NUMBER);
-}
-
-static int sirf_hwspinlock_remove(struct platform_device *pdev)
-{
- struct sirf_hwspinlock *hwspin = platform_get_drvdata(pdev);
- int ret;
-
- ret = hwspin_lock_unregister(&hwspin->bank);
- if (ret) {
- dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
- return ret;
- }
-
- return 0;
+ return devm_hwspin_lock_register(&pdev->dev, &hwspin->bank,
+ &sirf_hwspinlock_ops, 0,
+ HW_SPINLOCK_NUMBER);
}

static const struct of_device_id sirf_hwpinlock_ids[] = {
@@ -106,7 +92,6 @@ static int sirf_hwspinlock_remove(struct platform_device *pdev)

static struct platform_driver sirf_hwspinlock_driver = {
.probe = sirf_hwspinlock_probe,
- .remove = sirf_hwspinlock_remove,
.driver = {
.name = "atlas7_hwspinlock",
.of_match_table = of_match_ptr(sirf_hwpinlock_ids),
--
1.7.9.5

2020-01-22 00:18:21

by Bjorn Andersson

Subject: Re: [PATCH RESEND 0/3] Some improvements for SIRF hwspinlock

On Tue 07 Jan 19:23 PST 2020, Baolin Wang wrote:

> This patch set did some improvements for the SIRF hwspinlock driver,
> including changing to use devm_xxx APIs and removing some redundant
> pm runtime functions.
>

Thanks for resending the three series' Baolin! I've applied this as
well.

Regards,
Bjorn

> Baolin Wang (3):
> hwspinlock: sirf: Change to use devm_platform_ioremap_resource()
> hwspinlock: sirf: Remove redundant PM runtime functions
> hwspinlock: sirf: Use devm_hwspin_lock_register() to register hwlock
> controller
>
> drivers/hwspinlock/sirf_hwspinlock.c | 46 ++++++----------------------------
> 1 file changed, 7 insertions(+), 39 deletions(-)
>
> --
> 1.7.9.5
>