Commit 7b0a12ab authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Felipe Balbi

usb: gadget: fsl_qe_udc: Introduce use of 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 some labels are
renamed to preserve ordering.

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 avatarFelipe Balbi <balbi@ti.com>
parent 885162d1
...@@ -2539,7 +2539,7 @@ static int qe_udc_probe(struct platform_device *ofdev) ...@@ -2539,7 +2539,7 @@ static int qe_udc_probe(struct platform_device *ofdev)
goto err2; goto err2;
/* create a buf for ZLP send, need to remain zeroed */ /* create a buf for ZLP send, need to remain zeroed */
udc->nullbuf = kzalloc(256, GFP_KERNEL); udc->nullbuf = devm_kzalloc(&ofdev->dev, 256, GFP_KERNEL);
if (udc->nullbuf == NULL) { if (udc->nullbuf == NULL) {
dev_err(udc->dev, "cannot alloc nullbuf\n"); dev_err(udc->dev, "cannot alloc nullbuf\n");
ret = -ENOMEM; ret = -ENOMEM;
...@@ -2547,10 +2547,10 @@ static int qe_udc_probe(struct platform_device *ofdev) ...@@ -2547,10 +2547,10 @@ static int qe_udc_probe(struct platform_device *ofdev)
} }
/* buffer for data of get_status request */ /* buffer for data of get_status request */
udc->statusbuf = kzalloc(2, GFP_KERNEL); udc->statusbuf = devm_kzalloc(&ofdev->dev, 2, GFP_KERNEL);
if (udc->statusbuf == NULL) { if (udc->statusbuf == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto err4; goto err3;
} }
udc->nullp = virt_to_phys((void *)udc->nullbuf); udc->nullp = virt_to_phys((void *)udc->nullbuf);
...@@ -2581,13 +2581,13 @@ static int qe_udc_probe(struct platform_device *ofdev) ...@@ -2581,13 +2581,13 @@ static int qe_udc_probe(struct platform_device *ofdev)
if (ret) { if (ret) {
dev_err(udc->dev, "cannot request irq %d err %d\n", dev_err(udc->dev, "cannot request irq %d err %d\n",
udc->usb_irq, ret); udc->usb_irq, ret);
goto err5; goto err4;
} }
ret = usb_add_gadget_udc_release(&ofdev->dev, &udc->gadget, ret = usb_add_gadget_udc_release(&ofdev->dev, &udc->gadget,
qe_udc_release); qe_udc_release);
if (ret) if (ret)
goto err6; goto err5;
platform_set_drvdata(ofdev, udc); platform_set_drvdata(ofdev, udc);
dev_info(udc->dev, dev_info(udc->dev,
...@@ -2595,9 +2595,9 @@ static int qe_udc_probe(struct platform_device *ofdev) ...@@ -2595,9 +2595,9 @@ static int qe_udc_probe(struct platform_device *ofdev)
(udc->soc_type == PORT_QE) ? "QE" : "CPM"); (udc->soc_type == PORT_QE) ? "QE" : "CPM");
return 0; return 0;
err6:
free_irq(udc->usb_irq, udc);
err5: err5:
free_irq(udc->usb_irq, udc);
err4:
irq_dispose_mapping(udc->usb_irq); irq_dispose_mapping(udc->usb_irq);
err_noirq: err_noirq:
if (udc->nullmap) { if (udc->nullmap) {
...@@ -2610,9 +2610,6 @@ static int qe_udc_probe(struct platform_device *ofdev) ...@@ -2610,9 +2610,6 @@ static int qe_udc_probe(struct platform_device *ofdev)
udc->nullp, 256, udc->nullp, 256,
DMA_TO_DEVICE); DMA_TO_DEVICE);
} }
kfree(udc->statusbuf);
err4:
kfree(udc->nullbuf);
err3: err3:
ep = &udc->eps[0]; ep = &udc->eps[0];
cpm_muram_free(cpm_muram_offset(ep->rxbase)); cpm_muram_free(cpm_muram_offset(ep->rxbase));
...@@ -2660,8 +2657,6 @@ static int qe_udc_remove(struct platform_device *ofdev) ...@@ -2660,8 +2657,6 @@ static int qe_udc_remove(struct platform_device *ofdev)
udc->nullp, 256, udc->nullp, 256,
DMA_TO_DEVICE); DMA_TO_DEVICE);
} }
kfree(udc->statusbuf);
kfree(udc->nullbuf);
ep = &udc->eps[0]; ep = &udc->eps[0];
cpm_muram_free(cpm_muram_offset(ep->rxbase)); cpm_muram_free(cpm_muram_offset(ep->rxbase));
......
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