> > Renames OTG_STATE_* to USB_PHY_STATE_*, >From my opinion, below are OTG/EH states, why they are needed to change to USB_PHY_STATE_*. And at ulpi/utmi+ spec where is no information of below states. enum usb_otg_state { OTG_STATE_UNDEFINED = 0, /* single-role peripheral, and dual-role default-b */ OTG_STATE_B_IDLE, OTG_STATE_B_SRP_INIT, OTG_STATE_B_PERIPHERAL, /* extra dual-role default-b states */ OTG_STATE_B_WAIT_ACON, OTG_STATE_B_HOST, /* dual-role default-a */ OTG_STATE_A_IDLE, OTG_STATE_A_WAIT_VRISE, OTG_STATE_A_WAIT_BCON, OTG_STATE_A_HOST, OTG_STATE_A_SUSPEND, OTG_STATE_A_PERIPHERAL, OTG_STATE_A_WAIT_VFALL, OTG_STATE_A_VBUS_ERR, }; > usb_xceiv_event to usb_phy_event and > otg_state_string() to usb_phy_state_string(). > > Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > --- > drivers/power/pda_power.c | 2 +- > drivers/usb/host/ohci-omap.c | 2 +- > drivers/usb/musb/am35x.c | 33 ++++--- > drivers/usb/musb/blackfin.c | 22 ++-- > drivers/usb/musb/da8xx.c | 33 ++++--- > drivers/usb/musb/davinci.c | 20 ++-- > drivers/usb/musb/musb_core.c | 151 ++++++++++++++++-------------- > drivers/usb/musb/musb_gadget.c | 50 +++++----- > drivers/usb/musb/musb_host.c | 8 +- > drivers/usb/musb/musb_virthub.c | 28 +++--- > drivers/usb/musb/omap2430.c | 30 +++--- > drivers/usb/musb/tusb6010.c | 60 ++++++------ > drivers/usb/otg/ab8500-usb.c | 10 +- > drivers/usb/otg/fsl_otg.c | 16 ++-- > drivers/usb/otg/fsl_otg.h | 2 +- > drivers/usb/otg/gpio_vbus.c | 10 +- > drivers/usb/otg/isp1301_omap.c | 198 ++++++++++++++++++++------------- > ------ > drivers/usb/otg/langwell_otg.c | 178 +++++++++++++++++---------------- > - > drivers/usb/otg/msm_otg.c | 62 ++++++------ > drivers/usb/otg/nop-usb-xceiv.c | 4 +- > drivers/usb/otg/otg.c | 30 +++--- > drivers/usb/otg/otg_fsm.c | 152 +++++++++++++++--------------- > drivers/usb/otg/twl4030-usb.c | 10 +- > drivers/usb/otg/twl6030-usb.c | 8 +- > include/linux/usb/msm_hsusb.h | 2 +- > include/linux/usb/otg.h | 42 ++++---- > 26 files changed, 590 insertions(+), 573 deletions(-) > > diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c > index 8f817e6..60433b7 100644 > --- a/drivers/power/pda_power.c > +++ b/drivers/power/pda_power.c > @@ -222,7 +222,7 @@ static void polling_timer_func(unsigned long unused) > #ifdef CONFIG_USB_OTG_UTILS > static int otg_is_usb_online(void) > { > - return (transceiver->state == OTG_STATE_B_PERIPHERAL); > + return (transceiver->state == USB_PHY_STATE_B_PERIPHERAL); > } > #endif > > diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c > index e4b8782..96073bd 100644 > --- a/drivers/usb/host/ohci-omap.c > +++ b/drivers/usb/host/ohci-omap.c > @@ -174,7 +174,7 @@ static void start_hnp(struct ohci_hcd *ohci) > otg_start_hnp(ohci->transceiver); > > local_irq_save(flags); > - ohci->transceiver->state = OTG_STATE_A_SUSPEND; > + ohci->transceiver->state = USB_PHY_STATE_A_SUSPEND; > #else > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html