Re: [PATCH 4/5] drivers/video/msm/mddi_client_dummy.c: use devm_ functions
From: David Brown <hidden>
Date: 2012-08-09 17:57:17
Also in:
kernel-janitors, linux-arm-msm, linux-fbdev
On Fri, Aug 03, 2012 at 05:40:14PM +0200, Damien Cassou wrote:
quoted hunk ↗ jump to hunk
From: Damien Cassou <redacted> The various devm_ functions allocate memory that is released when a driver detaches. This patch replaces the use of kzalloc by devm_kzalloc. Signed-off-by: Damien Cassou <redacted> --- drivers/video/msm/mddi_client_dummy.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)diff --git a/drivers/video/msm/mddi_client_dummy.c b/drivers/video/msm/mddi_client_dummy.c index d2a091c..4c31325 100644 --- a/drivers/video/msm/mddi_client_dummy.c +++ b/drivers/video/msm/mddi_client_dummy.c@@ -51,7 +51,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); + devm_kzalloc(&pdev->dev, sizeof(struct panel_info), GFP_KERNEL); int ret; if (!panel) return -ENOMEM;@@ -67,18 +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; + return platform_device_register(&panel->pdev);
Removing this block causes a warning: kernel/drivers/video/msm/mddi_client_dummy.c: In function 'mddi_dummy_probe': kernel/drivers/video/msm/mddi_client_dummy.c:55:6: warning: unused variable 'ret' [-Wunused-variable] Please remove the 'int ret;' line above as well. Thanks, David Brown -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.