usb: move the OTG state from the USB PHY to the OTG structure

[karo-tx-linux.git] / drivers / usb / phy / phy-ab8500-usb.c

diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 11ab2c45e46220ac98a9dc829fd88cecde51aa70..2d5250143ce14a8ef8968220f463526b125a6fa9 100644 (file)
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -446,7 +446,7 @@ static int ab9540_usb_link_status_update(struct ab8500_usb *ab,
                if (event != UX500_MUSB_RIDB)
                        event = UX500_MUSB_NONE;
                /* Fallback to default B_IDLE as nothing is connected. */
-               ab->phy.state = OTG_STATE_B_IDLE;
+               ab->phy.otg->state = OTG_STATE_B_IDLE;
                break;
 
        case USB_LINK_ACA_RID_C_NM_9540:
@@ -584,7 +584,7 @@ static int ab8540_usb_link_status_update(struct ab8500_usb *ab,
                 * Fallback to default B_IDLE as nothing
                 * is connected
                 */
-               ab->phy.state = OTG_STATE_B_IDLE;
+               ab->phy.otg->state = OTG_STATE_B_IDLE;
                break;
 
        case USB_LINK_ACA_RID_C_NM_8540:
@@ -693,7 +693,7 @@ static int ab8505_usb_link_status_update(struct ab8500_usb *ab,
                 * Fallback to default B_IDLE as nothing
                 * is connected
                 */
-               ab->phy.state = OTG_STATE_B_IDLE;
+               ab->phy.otg->state = OTG_STATE_B_IDLE;
                break;
 
        case USB_LINK_ACA_RID_C_NM_8505:
@@ -776,7 +776,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab,
                if (event != UX500_MUSB_RIDB)
                        event = UX500_MUSB_NONE;
                /* Fallback to default B_IDLE as nothing is connected */
-               ab->phy.state = OTG_STATE_B_IDLE;
+               ab->phy.otg->state = OTG_STATE_B_IDLE;
                break;
 
        case USB_LINK_ACA_RID_C_NM_8500:
@@ -1380,7 +1380,7 @@ static int ab8500_usb_probe(struct platform_device *pdev)
        ab->phy.label           = "ab8500";
        ab->phy.set_suspend     = ab8500_usb_set_suspend;
        ab->phy.set_power       = ab8500_usb_set_power;
-       ab->phy.state           = OTG_STATE_UNDEFINED;
+       ab->phy.otg->state      = OTG_STATE_UNDEFINED;
 
        otg->phy                = &ab->phy;
        otg->set_host           = ab8500_usb_set_host;