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

Commit 6a902305 authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Tomi Valkeinen
Browse files

video: msm: Introduce the use of the managed version of kzalloc 



This patch moves data allocated using kzalloc to managed data allocated
using devm_kzalloc and cleans now unnecessary kfrees in probe and remove
functions. Also, linux/device.h is added to make sure the devm_*()
routine declarations are unambiguously available. The function
mddi_dummy_remove is removed as it is no longer required after
removing the kfree. The variable ret is also done away with.

The following Coccinelle semantic patch was used for making a part of
the change:

@platform@
identifier p, probefn, removefn;
@@
struct platform_driver p = {
  .probe = probefn,
  .remove = removefn,
};

@prb@
identifier platform.probefn, pdev;
expression e, e1, e2;
@@
probefn(struct platform_device *pdev, ...) {
  <+...
- e = kzalloc(e1, e2)
+ e = devm_kzalloc(&pdev->dev, e1, e2)
  ...
?-kfree(e);
  ...+>
}

@rem depends on prb@
identifier platform.removefn;
expression e;
@@
removefn(...) {
  <...
- kfree(e);
  ...>
}

Signed-off-by: default avatarHimangi Saraogi <himangi774@gmail.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 8c70f533

drivers/video/fbdev/msm/mddi_client_dummy.c

+3 −16
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * GNU General Public License for more details.

 */



#include <linux/device.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/kernel.h>
@@ -51,8 +52,7 @@ static int mddi_dummy_probe(struct platform_device *pdev) 
{

	struct msm_mddi_client_data *client_data = pdev->dev.platform_data;

	struct panel_info *panel =

		kzalloc(sizeof(struct panel_info), GFP_KERNEL);

	int ret;

		devm_kzalloc(&pdev->dev, sizeof(struct panel_info), GFP_KERNEL);

	if (!panel)

		return -ENOMEM;

	platform_set_drvdata(pdev, panel);
@@ -67,24 +67,11 @@ static int mddi_dummy_probe(struct platform_device *pdev) 
				      client_data->fb_resource, 1);

	panel->panel_data.fb_data = client_data->private_client_data;

	panel->pdev.dev.platform_data = &panel->panel_data;

	ret = platform_device_register(&panel->pdev);

	if (ret) {

		kfree(panel);

		return ret;

	}

	return 0;

}



static int mddi_dummy_remove(struct platform_device *pdev)

{

	struct panel_info *panel = platform_get_drvdata(pdev);

	kfree(panel);

	return 0;

	return platform_device_register(&panel->pdev);

}



static struct platform_driver mddi_client_dummy = {

	.probe = mddi_dummy_probe,

	.remove = mddi_dummy_remove,

	.driver = { .name = "mddi_c_dummy" },

};