mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
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: Himangi Saraogi <himangi774@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
8c70f53370
commit
6a90230593
1 changed files with 3 additions and 16 deletions
|
@ -15,6 +15,7 @@
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <linux/device.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/kernel.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 msm_mddi_client_data *client_data = pdev->dev.platform_data;
|
||||||
struct panel_info *panel =
|
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)
|
if (!panel)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
platform_set_drvdata(pdev, panel);
|
platform_set_drvdata(pdev, panel);
|
||||||
|
@ -67,24 +67,11 @@ static int mddi_dummy_probe(struct platform_device *pdev)
|
||||||
client_data->fb_resource, 1);
|
client_data->fb_resource, 1);
|
||||||
panel->panel_data.fb_data = client_data->private_client_data;
|
panel->panel_data.fb_data = client_data->private_client_data;
|
||||||
panel->pdev.dev.platform_data = &panel->panel_data;
|
panel->pdev.dev.platform_data = &panel->panel_data;
|
||||||
ret = platform_device_register(&panel->pdev);
|
return 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_driver mddi_client_dummy = {
|
static struct platform_driver mddi_client_dummy = {
|
||||||
.probe = mddi_dummy_probe,
|
.probe = mddi_dummy_probe,
|
||||||
.remove = mddi_dummy_remove,
|
|
||||||
.driver = { .name = "mddi_c_dummy" },
|
.driver = { .name = "mddi_c_dummy" },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue