Commit cdfe35fb authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Felipe Balbi

usb: musb: tusb6010: 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, the unnecesary labels are removed and linux/device.h is
added to make sure the devm_*() routine declarations are unambiguously
available.

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>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 276f146a
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/usb/usb_phy_generic.h> #include <linux/usb/usb_phy_generic.h>
...@@ -1160,12 +1161,12 @@ static int tusb_probe(struct platform_device *pdev) ...@@ -1160,12 +1161,12 @@ static int tusb_probe(struct platform_device *pdev)
struct platform_device *musb; struct platform_device *musb;
struct tusb6010_glue *glue; struct tusb6010_glue *glue;
struct platform_device_info pinfo; struct platform_device_info pinfo;
int ret = -ENOMEM; int ret;
glue = kzalloc(sizeof(*glue), GFP_KERNEL); glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
if (!glue) { if (!glue) {
dev_err(&pdev->dev, "failed to allocate glue context\n"); dev_err(&pdev->dev, "failed to allocate glue context\n");
goto err0; return -ENOMEM;
} }
glue->dev = &pdev->dev; glue->dev = &pdev->dev;
...@@ -1204,16 +1205,10 @@ static int tusb_probe(struct platform_device *pdev) ...@@ -1204,16 +1205,10 @@ static int tusb_probe(struct platform_device *pdev)
if (IS_ERR(musb)) { if (IS_ERR(musb)) {
ret = PTR_ERR(musb); ret = PTR_ERR(musb);
dev_err(&pdev->dev, "failed to register musb device: %d\n", ret); dev_err(&pdev->dev, "failed to register musb device: %d\n", ret);
goto err3; return ret;
} }
return 0; return 0;
err3:
kfree(glue);
err0:
return ret;
} }
static int tusb_remove(struct platform_device *pdev) static int tusb_remove(struct platform_device *pdev)
...@@ -1222,7 +1217,6 @@ static int tusb_remove(struct platform_device *pdev) ...@@ -1222,7 +1217,6 @@ static int tusb_remove(struct platform_device *pdev)
platform_device_unregister(glue->musb); platform_device_unregister(glue->musb);
usb_phy_generic_unregister(glue->phy); usb_phy_generic_unregister(glue->phy);
kfree(glue);
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