mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 21:51:40 +00:00
hwspinlock: u8500_hsem: 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. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
parent
637bcd19be
commit
acc98c1f2a
@ -119,8 +119,8 @@ static int u8500_hsem_probe(struct platform_device *pdev)
|
||||
/* no pm needed for HSem but required to comply with hwspilock core */
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
|
||||
ret = hwspin_lock_register(bank, &pdev->dev, &u8500_hwspinlock_ops,
|
||||
pdata->base_id, num_locks);
|
||||
ret = devm_hwspin_lock_register(&pdev->dev, bank, &u8500_hwspinlock_ops,
|
||||
pdata->base_id, num_locks);
|
||||
if (ret) {
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
return ret;
|
||||
@ -133,17 +133,10 @@ static int u8500_hsem_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct hwspinlock_device *bank = platform_get_drvdata(pdev);
|
||||
void __iomem *io_base = bank->lock[0].priv - HSEM_REGISTER_OFFSET;
|
||||
int ret;
|
||||
|
||||
/* clear all interrupts */
|
||||
writel(0xFFFF, io_base + HSEM_ICRALL);
|
||||
|
||||
ret = hwspin_lock_unregister(bank);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user