diff options
| author | Amitoj Kaur Chawla <amitoj1606@gmail.com> | 2016-03-22 22:22:48 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-28 07:30:36 -0700 |
| commit | ba99a0f19ae04820104c1cba11027ec69495879c (patch) | |
| tree | 9426bbdbce86cd7c3f618a16867f40fce4052e7c /drivers/staging/media/omap1 | |
| parent | f90272f432f7515044d9e13a6fa2c8bf1ac14838 (diff) | |
| download | op-kernel-dev-ba99a0f19ae04820104c1cba11027ec69495879c.zip op-kernel-dev-ba99a0f19ae04820104c1cba11027ec69495879c.tar.gz | |
staging: media: omap1: Replace kzalloc with devm_kzalloc
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>
Diffstat (limited to 'drivers/staging/media/omap1')
| -rw-r--r-- | drivers/staging/media/omap1/omap1_camera.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/staging/media/omap1/omap1_camera.c b/drivers/staging/media/omap1/omap1_camera.c index bd00180..8cc4a0a 100644 --- a/drivers/staging/media/omap1/omap1_camera.c +++ b/drivers/staging/media/omap1/omap1_camera.c @@ -1580,11 +1580,10 @@ static int omap1_cam_probe(struct platform_device *pdev) if (IS_ERR(clk)) return PTR_ERR(clk); - pcdev = kzalloc(sizeof(*pcdev) + resource_size(res), GFP_KERNEL); - if (!pcdev) { - dev_err(&pdev->dev, "Could not allocate pcdev\n"); + pcdev = devm_kzalloc(&pdev->dev, sizeof(*pcdev) + resource_size(res), + GFP_KERNEL); + if (!pcdev) return -ENOMEM; - } pcdev->res = res; pcdev->clk = clk; @@ -1620,10 +1619,8 @@ static int omap1_cam_probe(struct platform_device *pdev) /* * Request the region. */ - if (!request_mem_region(res->start, resource_size(res), DRIVER_NAME)) { - err = -EBUSY; - goto exit_kfree; - } + if (!request_mem_region(res->start, resource_size(res), DRIVER_NAME)) + return -EBUSY; base = ioremap(res->start, resource_size(res)); if (!base) { @@ -1680,8 +1677,6 @@ exit_iounmap: iounmap(base); exit_release: release_mem_region(res->start, resource_size(res)); -exit_kfree: - kfree(pcdev); exit: return err; } @@ -1704,8 +1699,6 @@ static int omap1_cam_remove(struct platform_device *pdev) res = pcdev->res; release_mem_region(res->start, resource_size(res)); - kfree(pcdev); - dev_info(&pdev->dev, "OMAP1 Camera Interface driver unloaded\n"); return 0; |
