usb: phy: fsl: Fix build errors

commit e47d925 (usb: move the OTG state from
the USB PHY to the OTG structure) moved the
OTG state from struct usb_phy to struct usb_otg.

Unfortunately, even though I fixed quite a few
build regressions with that patch already, this
one was still missing.

Note that this driver still has other randconfig
build problems which I'll leave for driver author
to fix, as that's less trivial.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index b7f36b212422f8d3908465386a0f605647b9a2b8..ab38aa32a6c160ee6d38b61dc22b308180f945f1 100644 (file)
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -274,7 +274,7 @@ void b_srp_end(unsigned long foo)
        fsl_otg_dischrg_vbus(0);
        srp_wait_done = 1;
 
-       if ((fsl_otg_dev->phy.state == OTG_STATE_B_SRP_INIT) &&
+       if ((fsl_otg_dev->phy.otg->state == OTG_STATE_B_SRP_INIT) &&
            fsl_otg_dev->fsm.b_sess_vld)
                fsl_otg_dev->fsm.b_srp_done = 1;
 }
@@ -624,7 +624,7 @@ static int fsl_otg_set_host(struct usb_otg *otg, struct usb_bus *host)
                        /* Mini-A cable connected */
                        struct otg_fsm *fsm = &otg_dev->fsm;
 
-                       otg.state = OTG_STATE_UNDEFINED;
+                       otg->state = OTG_STATE_UNDEFINED;
                        fsm->protocol = PROTO_UNDEF;
                }
        }
@@ -682,7 +682,7 @@ static int fsl_otg_set_power(struct usb_phy *phy, unsigned mA)
 {
        if (!fsl_otg_dev)
                return -ENODEV;
-       if (phy->otg.state == OTG_STATE_B_PERIPHERAL)
+       if (phy->otg->state == OTG_STATE_B_PERIPHERAL)
                pr_info("FSL OTG: Draw %d mA\n", mA);
 
        return 0;
@@ -715,7 +715,7 @@ static int fsl_otg_start_srp(struct usb_otg *otg)
 {
        struct fsl_otg *otg_dev;
 
-       if (!otg || otg.state != OTG_STATE_B_IDLE)
+       if (!otg || otg->state != OTG_STATE_B_IDLE)
                return -ENODEV;
 
        otg_dev = container_of(otg->usb_phy, struct fsl_otg, phy);
@@ -990,10 +990,10 @@ int usb_otg_start(struct platform_device *pdev)
         * Also: record initial state of ID pin
         */
        if (fsl_readl(&p_otg->dr_mem_map->otgsc) & OTGSC_STS_USB_ID) {
-               p_otg->phy->otg.state = OTG_STATE_UNDEFINED;
+               p_otg->phy.otg->state = OTG_STATE_UNDEFINED;
                p_otg->fsm.id = 1;
        } else {
-               p_otg->phy->otg.state = OTG_STATE_A_IDLE;
+               p_otg->phy.otg->state = OTG_STATE_A_IDLE;
                p_otg->fsm.id = 0;
        }
 
@@ -1048,7 +1048,7 @@ static int show_fsl_usb2_otg_state(struct device *dev,
        /* State */
        t = scnprintf(next, size,
                      "OTG state: %s\n\n",
-                     usb_otg_state_string(fsl_otg_dev->phy.state));
+                     usb_otg_state_string(fsl_otg_dev->phy.otg->state));
        size -= t;
        next += t;
 

diff --git a/drivers/usb/phy/phy-fsl-usb.h b/drivers/usb/phy/phy-fsl-usb.h
index 5986c96354dfacb78b4990aec2f7f54502f2e102..23149954a09c06d9ce7b29bd3b44758d631f8a3d 100644 (file)
--- a/drivers/usb/phy/phy-fsl-usb.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
@@ -298,7 +298,7 @@
 /* SE0 Time Before SRP */
 #define TB_SE0_SRP     (2)     /* b_idle,minimum 2 ms, section:5.3.2 */
 
-#define SET_OTG_STATE(otg_ptr, newstate)       ((otg_ptr)->state = newstate)
+#define SET_OTG_STATE(phy, newstate)   ((phy)->otg->state = newstate)
 
 struct usb_dr_mmap {
        /* Capability register */