Some optimization for Spreadtrum hwlock controller
Subsystems (2)
cover Some optimization for Spreadtrum hwlock controller
This patch set did some optimization for Spreadtrum hwlock controller, including using some devm_xxx APIs to simplify code and validating the return value when enabling clock.
Baolin Wang (4):
hwspinlock: sprd: Change to use devm_platform_ioremap_resource()
hwspinlock: sprd: Check the return value of clk_prepare_enable()
hwspinlock: sprd: Use devm_add_action_or_reset() for calls to
clk_disable_unprepare()
hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock
controller
drivers/hwspinlock/sprd_hwspinlock.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/4 hwspinlock: sprd: Change to use devm_platform_ioremap_resource()
Use the new helper that wraps the calls to platform_get_resource() and devm_ioremap_resource() together, which can simpify the code.
--- drivers/hwspinlock/sprd_hwspinlock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/hwspinlock/sprd_hwspinlock.c +1 -3
@@ -83,7 +83,6 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev) {struct sprd_hwspinlock_dev *sprd_hwlock;struct hwspinlock *lock; -struct resource *res;int i, ret;if (!pdev->dev.of_node)
@@ -96,8 +95,7 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)if (!sprd_hwlock)return -ENOMEM ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - sprd_hwlock->base =devm_ioremap_resource (&pdev->dev, res); + sprd_hwlock->base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (sprd_hwlock->base))return PTR_ERR (sprd_hwlock->base);
Signature · 1 line
1.7.9.5
PATCH 2/4 hwspinlock: sprd: Check the return value of clk_prepare_enable()
In reply to Baolin WangWe must check the return value of clk_prepare_enable() to make sure the hardware spinlock controller can be enabled successfully, otherwise we should return error.
--- drivers/hwspinlock/sprd_hwspinlock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hwspinlock/sprd_hwspinlock.c +3 -1
@@ -105,7 +105,9 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)return PTR_ERR (sprd_hwlock->clk); } -clk_prepare_enable (sprd_hwlock->clk); + ret =clk_prepare_enable (sprd_hwlock->clk); +if (ret) +return ret;/* set the hwspinlock to record user id to identify subsystems */ writel (HWSPINLOCK_USER_BITS , sprd_hwlock->base +HWSPINLOCK_RECCTRL );
Signature · 1 line
1.7.9.5
PATCH 3/4 hwspinlock: sprd: Use devm_add_action_or_reset() for calls to clk_disable_unprepare()
In reply to Baolin WangUse devm_add_action_or_reset() for calls to clk_disable_unprepare(), which can simplify the error handling.
--- drivers/hwspinlock/sprd_hwspinlock.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/hwspinlock/sprd_hwspinlock.c +15 -2
@@ -79,6 +79,13 @@ static void sprd_hwspinlock_relax(struct hwspinlock *lock) .relax = sprd_hwspinlock_relax, }; +static void sprd_hwspinlock_disable (void *data) +{ +struct sprd_hwspinlock_dev *sprd_hwlock = data; + +clk_disable_unprepare (sprd_hwlock->clk); +} +static int sprd_hwspinlock_probe (struct platform_device *pdev) {struct sprd_hwspinlock_dev *sprd_hwlock;
@@ -109,6 +116,14 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)if (ret)return ret; + ret =devm_add_action_or_reset (&pdev->dev, sprd_hwspinlock_disable, + sprd_hwlock); +if (ret) { +dev_err (&pdev->dev, +"Failed to add hwspinlock disable action\n" ); +return ret; + } +/* set the hwspinlock to record user id to identify subsystems */ writel (HWSPINLOCK_USER_BITS , sprd_hwlock->base +HWSPINLOCK_RECCTRL );
@@ -124,7 +139,6 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev) &sprd_hwspinlock_ops, 0, SPRD_HWLOCKS_NUM);if (ret) {pm_runtime_disable (&pdev->dev); -clk_disable_unprepare (sprd_hwlock->clk);return ret; }
@@ -137,7 +151,6 @@ static int sprd_hwspinlock_remove(struct platform_device *pdev)hwspin_lock_unregister (&sprd_hwlock->bank);pm_runtime_disable (&pdev->dev); -clk_disable_unprepare (sprd_hwlock->clk);return 0 ; }
Signature · 1 line
1.7.9.5
PATCH 4/4 hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller
In reply to Baolin WangUse devm_hwspin_lock_register() to register the hwlock controller instead of unregistering the hwlock controller explicitly when removing the device.
--- drivers/hwspinlock/sprd_hwspinlock.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/hwspinlock/sprd_hwspinlock.c +3 -5
@@ -135,8 +135,9 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)platform_set_drvdata (pdev, sprd_hwlock);pm_runtime_enable (&pdev->dev); - ret =hwspin_lock_register (&sprd_hwlock->bank, &pdev->dev, - &sprd_hwspinlock_ops,0 ,SPRD_HWLOCKS_NUM ); + ret =devm_hwspin_lock_register (&pdev->dev, &sprd_hwlock->bank, + &sprd_hwspinlock_ops,0 , +SPRD_HWLOCKS_NUM );if (ret) {pm_runtime_disable (&pdev->dev);return ret;
@@ -147,9 +148,6 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)static int sprd_hwspinlock_remove (struct platform_device *pdev) { -struct sprd_hwspinlock_dev *sprd_hwlock =platform_get_drvdata (pdev); - -hwspin_lock_unregister (&sprd_hwlock->bank);pm_runtime_disable (&pdev->dev);return 0 ; }
Signature · 1 line
1.7.9.5
Re: [PATCH 4/4] hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller
Quoted 4 lines · Baolin Wang
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]>
Thanks Baolin, series applied.
Regards,
Bjorn
Quoted 33 lines
--- drivers/hwspinlock/sprd_hwspinlock.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/hwspinlock/sprd_hwspinlock.c +3
-5@@ -135,8 +135,9 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)platform_set_drvdata (pdev, sprd_hwlock);pm_runtime_enable (&pdev->dev); - ret =hwspin_lock_register (&sprd_hwlock->bank, &pdev->dev, - &sprd_hwspinlock_ops,0 ,SPRD_HWLOCKS_NUM ); + ret =devm_hwspin_lock_register (&pdev->dev, &sprd_hwlock->bank, + &sprd_hwspinlock_ops,0 , +SPRD_HWLOCKS_NUM );if (ret) {pm_runtime_disable (&pdev->dev);return ret;@@ -147,9 +148,6 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)static int sprd_hwspinlock_remove (struct platform_device *pdev) { -struct sprd_hwspinlock_dev *sprd_hwlock =platform_get_drvdata (pdev); - -hwspin_lock_unregister (&sprd_hwlock->bank);pm_runtime_disable (&pdev->dev);return 0 ; }Signature · 1 line
1.7.9.5