| Message ID | 1344008414-2894-6-git-send-email-damien.cassou@lifl.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Aug 03, 2012 at 05:40:14PM +0200, Damien Cassou wrote: > From: Damien Cassou <damien.cassou@lifl.fr> > > 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 <damien.cassou@lifl.fr> > > --- > drivers/video/msm/mddi_client_dummy.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) Acked-by: David Brown <davidb@codeaurora.org>
On Fri, Aug 03, 2012 at 05:40:14PM +0200, Damien Cassou wrote: > From: Damien Cassou <damien.cassou@lifl.fr> > > 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 <damien.cassou@lifl.fr> > > --- > 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
On Thu, Aug 9, 2012 at 7:57 PM, David Brown <davidb@codeaurora.org> wrote: > 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. Thank you for your feedback. Please ignore this thread and patch. I've just sent a new email with corrected patch.
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); } static int mddi_dummy_remove(struct platform_device *pdev) { - struct panel_info *panel = platform_get_drvdata(pdev); - kfree(panel); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in