Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f875bf35 authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Felipe Balbi
Browse files

usb: musb: backfin: 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, a label is done away with and err2 and err3 renamed.

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 cdfe35fb

drivers/usb/musb/blackfin.c

+8 −12
Original line number Original line Diff line number Diff line
@@ -455,7 +455,7 @@ static int bfin_probe(struct platform_device *pdev) 




	int				ret = -ENOMEM;

	int				ret = -ENOMEM;





	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;

		goto err0;
@@ -464,7 +464,7 @@ static int bfin_probe(struct platform_device *pdev) 
	musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO);

	musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO);

	if (!musb) {

	if (!musb) {

		dev_err(&pdev->dev, "failed to allocate musb device\n");

		dev_err(&pdev->dev, "failed to allocate musb device\n");

		goto err1;

		goto err0;

	}

	}





	musb->dev.parent		= &pdev->dev;

	musb->dev.parent		= &pdev->dev;
@@ -478,7 +478,7 @@ static int bfin_probe(struct platform_device *pdev) 




	glue->phy = usb_phy_generic_register();

	glue->phy = usb_phy_generic_register();

	if (IS_ERR(glue->phy))

	if (IS_ERR(glue->phy))

		goto err2;

		goto err1;

	platform_set_drvdata(pdev, glue);

	platform_set_drvdata(pdev, glue);





	memset(musb_resources, 0x00, sizeof(*musb_resources) *

	memset(musb_resources, 0x00, sizeof(*musb_resources) *
@@ -498,31 +498,28 @@ static int bfin_probe(struct platform_device *pdev) 
			ARRAY_SIZE(musb_resources));

			ARRAY_SIZE(musb_resources));

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "failed to add resources\n");

		dev_err(&pdev->dev, "failed to add resources\n");

		goto err3;

		goto err2;

	}

	}





	ret = platform_device_add_data(musb, pdata, sizeof(*pdata));

	ret = platform_device_add_data(musb, pdata, sizeof(*pdata));

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "failed to add platform_data\n");

		dev_err(&pdev->dev, "failed to add platform_data\n");

		goto err3;

		goto err2;

	}

	}





	ret = platform_device_add(musb);

	ret = platform_device_add(musb);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "failed to register musb device\n");

		dev_err(&pdev->dev, "failed to register musb device\n");

		goto err3;

		goto err2;

	}

	}





	return 0;

	return 0;





err3:

	usb_phy_generic_unregister(glue->phy);



err2:

err2:

	platform_device_put(musb);

	usb_phy_generic_unregister(glue->phy);





err1:

err1:

	kfree(glue);

	platform_device_put(musb);





err0:

err0:

	return ret;

	return ret;
@@ -534,7 +531,6 @@ static int bfin_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;

}

}