Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / drivers / usb / phy / phy-zynq-usb.c

diff --git a/drivers/usb/otg/xilinx_usbps_otg.c b/drivers/usb/phy/phy-zynq-usb.c
similarity index 99%
rename from drivers/usb/otg/xilinx_usbps_otg.c
rename to drivers/usb/phy/phy-zynq-usb.c
index 14c297e071de88c81ac04e433cd7164eedf4efcd..f94128e292ab40798de4b180383355bea07dfbdf 100644 (file)
--- a/drivers/usb/otg/xilinx_usbps_otg.c
+++ b/drivers/usb/phy/phy-zynq-usb.c
@@ -846,7 +846,7 @@ static void xusbps_otg_work(struct work_struct *work)
        xotg = container_of(work, struct xusbps_otg, work);
 
        dev_dbg(xotg->dev, "%s: old state = %s\n", __func__,
-                       otg_state_string(xotg->otg.state));
+               usb_otg_state_string(xotg->otg.state));
 
        switch (xotg->otg.state) {
        case OTG_STATE_UNDEFINED:
@@ -1550,7 +1550,7 @@ static void xusbps_otg_work(struct work_struct *work)
        }
 
        dev_dbg(xotg->dev, "%s: new state = %s\n", __func__,
-                       otg_state_string(xotg->otg.state));
+               usb_otg_state_string(xotg->otg.state));
 }
 
 static ssize_t
@@ -1633,7 +1633,7 @@ show_hsm(struct device *_dev, struct device_attribute *attr, char *buf)
                "b_bus_req = \t%d\n"
                "b_bus_suspend_tmout = \t%d\n"
                "b_bus_suspend_vld = \t%d\n",
-               otg_state_string(xotg->otg.state),
+               usb_otg_state_string(xotg->otg.state),
                xotg->hsm.a_bus_resume,
                xotg->hsm.a_bus_suspend,
                xotg->hsm.a_conn,