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

Commit 14b4099c authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: remove duplicate dev_set_drvdata for host_start 



The core driver has already done it, besides, move set driver data
operation just after ci has allocated successfully in case some
code (like ci_role_start) want to access this driver data.

Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b157300

drivers/usb/chipidea/core.c

+1 −1
Original line number Diff line number Diff line
@@ -669,6 +669,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) 
	if (!ci)

		return -ENOMEM;



	platform_set_drvdata(pdev, ci);

	ci->dev = dev;

	ci->platdata = dev_get_platdata(dev);

	ci->imx28_write_fix = !!(ci->platdata->flags &
@@ -782,7 +783,6 @@ static int ci_hdrc_probe(struct platform_device *pdev) 
		}

	}



	platform_set_drvdata(pdev, ci);

	ret = devm_request_irq(dev, ci->irq, ci_irq, IRQF_SHARED,

			ci->platdata->name, ci);

	if (ret)

drivers/usb/chipidea/host.c

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static int host_start(struct ci_hdrc *ci) 
	if (!hcd)

		return -ENOMEM;



	dev_set_drvdata(ci->dev, ci);

	hcd->rsrc_start = ci->hw_bank.phys;

	hcd->rsrc_len = ci->hw_bank.size;

	hcd->regs = ci->hw_bank.abs;