| Message ID | e8f1db04571f62298c7a4f72be803b9b9974d12d.1569567749.git.baolin.wang@linaro.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | b674a30bf8b0edf3b966e32dfcb2e00dfca5a823 |
| Headers | show |
| Series | Some optimization for Spreadtrum hwlock controller | expand |
On Fri 27 Sep 00:10 PDT 2019, Baolin Wang wrote: > 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 <baolin.wang@linaro.org> Thanks Baolin, series applied. Regards, Bjorn > --- > drivers/hwspinlock/sprd_hwspinlock.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/hwspinlock/sprd_hwspinlock.c b/drivers/hwspinlock/sprd_hwspinlock.c > index e76c702..44d69db 100644 > --- a/drivers/hwspinlock/sprd_hwspinlock.c > +++ b/drivers/hwspinlock/sprd_hwspinlock.c > @@ -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; > } > -- > 1.7.9.5 >
diff --git a/drivers/hwspinlock/sprd_hwspinlock.c b/drivers/hwspinlock/sprd_hwspinlock.c index e76c702..44d69db 100644 --- a/drivers/hwspinlock/sprd_hwspinlock.c +++ b/drivers/hwspinlock/sprd_hwspinlock.c @@ -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; }
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 <baolin.wang@linaro.org> --- drivers/hwspinlock/sprd_hwspinlock.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)