Commit 30616fff authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Mauro Carvalho Chehab

[media] timblogiw: 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.The label err_register is removed as it is no longer required.

The following Coccinelle semantic patch was used for making 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 avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 26ac69f8
...@@ -800,7 +800,7 @@ static int timblogiw_probe(struct platform_device *pdev) ...@@ -800,7 +800,7 @@ static int timblogiw_probe(struct platform_device *pdev)
if (!pdata->encoder.module_name) if (!pdata->encoder.module_name)
dev_info(&pdev->dev, "Running without decoder\n"); dev_info(&pdev->dev, "Running without decoder\n");
lw = kzalloc(sizeof(*lw), GFP_KERNEL); lw = devm_kzalloc(&pdev->dev, sizeof(*lw), GFP_KERNEL);
if (!lw) { if (!lw) {
err = -ENOMEM; err = -ENOMEM;
goto err; goto err;
...@@ -820,7 +820,7 @@ static int timblogiw_probe(struct platform_device *pdev) ...@@ -820,7 +820,7 @@ static int timblogiw_probe(struct platform_device *pdev)
strlcpy(lw->v4l2_dev.name, DRIVER_NAME, sizeof(lw->v4l2_dev.name)); strlcpy(lw->v4l2_dev.name, DRIVER_NAME, sizeof(lw->v4l2_dev.name));
err = v4l2_device_register(NULL, &lw->v4l2_dev); err = v4l2_device_register(NULL, &lw->v4l2_dev);
if (err) if (err)
goto err_register; goto err;
lw->video_dev.v4l2_dev = &lw->v4l2_dev; lw->video_dev.v4l2_dev = &lw->v4l2_dev;
...@@ -837,8 +837,6 @@ static int timblogiw_probe(struct platform_device *pdev) ...@@ -837,8 +837,6 @@ static int timblogiw_probe(struct platform_device *pdev)
err_request: err_request:
v4l2_device_unregister(&lw->v4l2_dev); v4l2_device_unregister(&lw->v4l2_dev);
err_register:
kfree(lw);
err: err:
dev_err(&pdev->dev, "Failed to register: %d\n", err); dev_err(&pdev->dev, "Failed to register: %d\n", err);
...@@ -853,8 +851,6 @@ static int timblogiw_remove(struct platform_device *pdev) ...@@ -853,8 +851,6 @@ static int timblogiw_remove(struct platform_device *pdev)
v4l2_device_unregister(&lw->v4l2_dev); v4l2_device_unregister(&lw->v4l2_dev);
kfree(lw);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment