mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
mfd: ab8500-gpadc: Convert to managed resources for allocating memory
Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
c18cf6d1b0
commit
99cd4b4d5f
@ -925,7 +925,7 @@ static int ab8500_gpadc_probe(struct platform_device *pdev)
|
||||
int ret = 0;
|
||||
struct ab8500_gpadc *gpadc;
|
||||
|
||||
gpadc = kzalloc(sizeof(struct ab8500_gpadc), GFP_KERNEL);
|
||||
gpadc = devm_kzalloc(&pdev->dev, sizeof(struct ab8500_gpadc), GFP_KERNEL);
|
||||
if (!gpadc) {
|
||||
dev_err(&pdev->dev, "Error: No memory\n");
|
||||
return -ENOMEM;
|
||||
@ -1005,8 +1005,6 @@ fail_irq:
|
||||
free_irq(gpadc->irq_sw, gpadc);
|
||||
free_irq(gpadc->irq_hw, gpadc);
|
||||
fail:
|
||||
kfree(gpadc);
|
||||
gpadc = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -1031,8 +1029,6 @@ static int ab8500_gpadc_remove(struct platform_device *pdev)
|
||||
|
||||
pm_runtime_put_noidle(gpadc->dev);
|
||||
|
||||
kfree(gpadc);
|
||||
gpadc = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user