Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba99a0f1 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Greg Kroah-Hartman
Browse files

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: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f90272f4

drivers/staging/media/omap1/omap1_camera.c

+5 −12
Original line number Diff line number Diff line
@@ -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 @@ static int omap1_cam_probe(struct platform_device *pdev) 
	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;