mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
hwspinlock: u8500_hsem: Use devm_kzalloc() to allocate memory
Use devm_kzalloc() to allocate memory. 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
5ee45e0c89
commit
637bcd19be
@ -106,7 +106,8 @@ static int u8500_hsem_probe(struct platform_device *pdev)
|
||||
/* clear all interrupts */
|
||||
writel(0xFFFF, io_base + HSEM_ICRALL);
|
||||
|
||||
bank = kzalloc(struct_size(bank, lock, num_locks), GFP_KERNEL);
|
||||
bank = devm_kzalloc(&pdev->dev, struct_size(bank, lock, num_locks),
|
||||
GFP_KERNEL);
|
||||
if (!bank)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -120,15 +121,12 @@ static int u8500_hsem_probe(struct platform_device *pdev)
|
||||
|
||||
ret = hwspin_lock_register(bank, &pdev->dev, &u8500_hwspinlock_ops,
|
||||
pdata->base_id, num_locks);
|
||||
if (ret)
|
||||
goto reg_fail;
|
||||
if (ret) {
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
reg_fail:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
kfree(bank);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int u8500_hsem_remove(struct platform_device *pdev)
|
||||
@ -147,7 +145,6 @@ static int u8500_hsem_remove(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
kfree(bank);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user