From: Peter Chen <peter.chen@freescale.com>
Date: Tue, 14 Jul 2015 07:43:02 +0000 (+0800)
Subject: MLK-11340-8 usb: chipidea: host: delete the redundancy ci_hdrc struct
X-Git-Tag: C0P2-H0.0--20200415~4730
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=3a25e44573f628bf9d82a5279cb7b3852b6977d7;p=linux.git

MLK-11340-8 usb: chipidea: host: delete the redundancy ci_hdrc struct

The struct ci_hdrc is the drvdata for hcd device, so we don't
need to introduce extra ci_hdrc structure for ehci.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit 144247425683f783888e2a384946d05962237b60)
---

diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 65bd2b2ad858..111b0e0b8698 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -37,14 +37,12 @@ static int (*orig_bus_suspend)(struct usb_hcd *hcd);
 
 struct ehci_ci_priv {
 	struct regulator *reg_vbus;
-	struct ci_hdrc *ci;
 };
 
 static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
 {
 	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 	struct ehci_ci_priv *priv = (struct ehci_ci_priv *)ehci->priv;
-	struct ci_hdrc *ci = priv->ci;
 	struct device *dev = hcd->self.controller;
 	struct ci_hdrc *ci = dev_get_drvdata(dev);
 	int ret = 0;
@@ -143,7 +141,6 @@ static int host_start(struct ci_hdrc *ci)
 
 	priv = (struct ehci_ci_priv *)ehci->priv;
 	priv->reg_vbus = NULL;
-	priv->ci = ci;
 
 	if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci)) {
 		if (ci->platdata->flags & CI_HDRC_TURN_VBUS_EARLY_ON) {