Commit 4b70331b authored by Paul Cercueil's avatar Paul Cercueil Committed by Greg Kroah-Hartman
Browse files

usb: musb: jz4740: Add local dev variable to clean up probe 



Clean up the probe function by using a local 'struct device *dev'
variable, instead of referencing &pdev->dev everytime.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Link: https://lore.kernel.org/r/20200115132547.364-13-b-liu@ti.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e2ee1ab

drivers/usb/musb/jz4740.c

+10 −9
Original line number Diff line number Diff line
@@ -109,36 +109,37 @@ static const struct musb_platform_ops jz4740_musb_ops = { 


static int jz4740_probe(struct platform_device *pdev)

{

	struct device			*dev = &pdev->dev;

	struct musb_hdrc_platform_data	*pdata = &jz4740_musb_platform_data;

	struct platform_device		*musb;

	struct jz4740_glue		*glue;

	struct clk                      *clk;

	int				ret;



	glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);

	glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);

	if (!glue)

		return -ENOMEM;



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

	if (!musb) {

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

		dev_err(dev, "failed to allocate musb device");

		return -ENOMEM;

	}



	clk = devm_clk_get(&pdev->dev, "udc");

	clk = devm_clk_get(dev, "udc");

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "failed to get clock\n");

		dev_err(dev, "failed to get clock");

		ret = PTR_ERR(clk);

		goto err_platform_device_put;

	}



	ret = clk_prepare_enable(clk);

	if (ret) {

		dev_err(&pdev->dev, "failed to enable clock\n");

		dev_err(dev, "failed to enable clock");

		goto err_platform_device_put;

	}



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

	musb->dev.parent		= dev;



	glue->musb			= musb;

	glue->clk			= clk;
@@ -150,19 +151,19 @@ static int jz4740_probe(struct platform_device *pdev) 
	ret = platform_device_add_resources(musb, pdev->resource,

					    pdev->num_resources);

	if (ret) {

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

		dev_err(dev, "failed to add resources");

		goto err_clk_disable;

	}



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

	if (ret) {

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

		dev_err(dev, "failed to add platform_data");

		goto err_clk_disable;

	}



	ret = platform_device_add(musb);

	if (ret) {

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

		dev_err(dev, "failed to register musb device");

		goto err_clk_disable;

	}