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

Commit f390f57c authored by Ben Dooks's avatar Ben Dooks Committed by Felipe Balbi
Browse files

usb: gadget: r8a66597-udc: keep dev as reference to &pdev->dev 



Remove usages of &pdev->dev in the driver probe function
with just dev to make the references to it easier to
write. Convert all the current users of it to use it.

Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e1815053

drivers/usb/gadget/r8a66597-udc.c

+8 −8
Original line number Diff line number Diff line
@@ -1866,6 +1866,7 @@ static int __init r8a66597_sudmac_ioremap(struct r8a66597 *r8a66597, 


static int __init r8a66597_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	char clk_name[8];

	struct resource *res, *ires;

	int irq;
@@ -1886,7 +1887,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) 


	if (irq < 0) {

		ret = -ENODEV;

		dev_err(&pdev->dev, "platform_get_irq error.\n");

		dev_err(dev, "platform_get_irq error.\n");

		goto clean_up;

	}
@@ -1899,7 +1900,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) 


	spin_lock_init(&r8a66597->lock);

	platform_set_drvdata(pdev, r8a66597);

	r8a66597->pdata = dev_get_platdata(&pdev->dev);

	r8a66597->pdata = dev_get_platdata(dev);

	r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW;



	r8a66597->gadget.ops = &r8a66597_gadget_ops;
@@ -1913,10 +1914,9 @@ static int __init r8a66597_probe(struct platform_device *pdev) 


	if (r8a66597->pdata->on_chip) {

		snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);

		r8a66597->clk = clk_get(&pdev->dev, clk_name);

		r8a66597->clk = clk_get(dev, clk_name);

		if (IS_ERR(r8a66597->clk)) {

			dev_err(&pdev->dev, "cannot get clock \"%s\"\n",

				clk_name);

			dev_err(dev, "cannot get clock \"%s\"\n", clk_name);

			ret = PTR_ERR(r8a66597->clk);

			goto clean_up;

		}
@@ -1934,7 +1934,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) 
	ret = request_irq(irq, r8a66597_irq, IRQF_SHARED,

			udc_name, r8a66597);

	if (ret < 0) {

		dev_err(&pdev->dev, "request_irq error (%d)\n", ret);

		dev_err(dev, "request_irq error (%d)\n", ret);

		goto clean_up2;

	}
@@ -1972,11 +1972,11 @@ static int __init r8a66597_probe(struct platform_device *pdev) 
	}

	r8a66597->ep0_req->complete = nop_completion;



	ret = usb_add_gadget_udc(&pdev->dev, &r8a66597->gadget);

	ret = usb_add_gadget_udc(dev, &r8a66597->gadget);

	if (ret)

		goto err_add_udc;



	dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);

	dev_info(dev, "version %s\n", DRIVER_VERSION);

	return 0;



err_add_udc: