upstream: [media] timblogiw: Introduce the use of the managed version of kzalloc
authorHimangi Saraogi <himangi774@gmail.com>
Wed, 7 May 2014 04:44:18 +0000 (01:44 -0300)
committerChanho Park <chanho61.park@samsung.com>
Thu, 7 Aug 2014 05:26:59 +0000 (14:26 +0900)
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: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/timblogiw.c

index 6a74ce0..9361e57 100644 (file)
@@ -800,7 +800,7 @@ static int timblogiw_probe(struct platform_device *pdev)
        if (!pdata->encoder.module_name)
                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) {
                err = -ENOMEM;
                goto err;
@@ -820,7 +820,7 @@ static int timblogiw_probe(struct platform_device *pdev)
        strlcpy(lw->v4l2_dev.name, DRIVER_NAME, sizeof(lw->v4l2_dev.name));
        err = v4l2_device_register(NULL, &lw->v4l2_dev);
        if (err)
-               goto err_register;
+               goto err;
 
        lw->video_dev.v4l2_dev = &lw->v4l2_dev;
 
@@ -837,8 +837,6 @@ static int timblogiw_probe(struct platform_device *pdev)
 
 err_request:
        v4l2_device_unregister(&lw->v4l2_dev);
-err_register:
-       kfree(lw);
 err:
        dev_err(&pdev->dev, "Failed to register: %d\n", err);
 
@@ -853,8 +851,6 @@ static int timblogiw_remove(struct platform_device *pdev)
 
        v4l2_device_unregister(&lw->v4l2_dev);
 
-       kfree(lw);
-
        return 0;
 }