forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: media: omap1: Replace kzalloc with devm_kzalloc

Browse source 
Replace kzalloc with devm_kzalloc and consequently remove kfrees in
probe and remove functions of a platform device.

As a result of this change, remove unnecessary out of memory message
and an unnecessary label.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Amitoj Kaur Chawla 2016-03-22 22:22:48 +05:30 • committed by Greg Kroah-Hartman
parent f90272f432
commit ba99a0f19a
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/media/omap1/omap1_camera.c
View file

@ -1580,11 +1580,10 @@ static int omap1_cam_probe(struct platform_device *pdev)
if (IS_ERR(clk)) if (IS_ERR(clk))
return PTR_ERR(clk); return PTR_ERR(clk);
pcdev = kzalloc(sizeof(*pcdev) + resource_size(res), GFP_KERNEL); pcdev = devm_kzalloc(&pdev->dev, sizeof(*pcdev) + resource_size(res),
if (!pcdev) { GFP_KERNEL);
dev_err(&pdev->dev, "Could not allocate pcdev\n"); if (!pcdev)
return -ENOMEM; return -ENOMEM;
}
pcdev->res = res; pcdev->res = res;
pcdev->clk = clk; pcdev->clk = clk;
@ -1620,10 +1619,8 @@ static int omap1_cam_probe(struct platform_device *pdev)
/* /*
* Request the region. * Request the region.
*/ */
if (!request_mem_region(res->start, resource_size(res), DRIVER_NAME)) { if (!request_mem_region(res->start, resource_size(res), DRIVER_NAME))
err = -EBUSY; return -EBUSY;
goto exit_kfree;
}
base = ioremap(res->start, resource_size(res)); base = ioremap(res->start, resource_size(res));
if (!base) { if (!base) {
@ -1680,8 +1677,6 @@ exit_iounmap:
iounmap(base); iounmap(base);
exit_release: exit_release:
release_mem_region(res->start, resource_size(res)); release_mem_region(res->start, resource_size(res));
exit_kfree:
kfree(pcdev);
exit: exit:
return err; return err;
} }
@ -1704,8 +1699,6 @@ static int omap1_cam_remove(struct platform_device *pdev)
res = pcdev->res; res = pcdev->res;
release_mem_region(res->start, resource_size(res)); release_mem_region(res->start, resource_size(res));
kfree(pcdev);
dev_info(&pdev->dev, "OMAP1 Camera Interface driver unloaded\n"); dev_info(&pdev->dev, "OMAP1 Camera Interface driver unloaded\n");
return 0; return 0;