diff options
| author |   Baolin Wang <baolin.wang@linaro.org> | 2019-09-27 16:27:43 +0800 |
|---|---|---|
| committer |   Bjorn Andersson <bjorn.andersson@linaro.org> | 2019-10-04 20:20:41 -0700 |
| commit | acc98c1f2a1b4503588d3b1eb35db9cb76abdd89 (patch) | |
| tree | 0736438216ce10e3d831cb42ee841499f1bcb77e /drivers/hwspinlock | |
| parent | hwspinlock: u8500_hsem: Use devm_kzalloc() to allocate memory (diff) | |
| download | wireguard-linux-acc98c1f2a1b4503588d3b1eb35db9cb76abdd89.tar.xz wireguard-linux-acc98c1f2a1b4503588d3b1eb35db9cb76abdd89.zip | |
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>
Diffstat (limited to 'drivers/hwspinlock')
| -rw-r--r-- | drivers/hwspinlock/u8500_hsem.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c index 0e8d4ffa867d..b31141a9b927 100644 --- a/drivers/hwspinlock/u8500_hsem.c +++ b/drivers/hwspinlock/u8500_hsem.c @@ -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; |