usb: otg: Rename usb_xceiv_event to usb_phy_event

Convert all users.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/otg/ab8500-usb.c b/drivers/usb/otg/ab8500-usb.c
index 5f06dda7db61d8e07db12ebd499d5505e44d450b..b46a5fe178efdb75767cb91398524a0b8fe570dc 100644 (file)
--- a/drivers/usb/otg/ab8500-usb.c
+++ b/drivers/usb/otg/ab8500-usb.c
@@ -153,7 +153,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab)
        u8 reg;
        enum ab8500_usb_link_status lsts;
        void *v = NULL;
-       enum usb_xceiv_events event;
+       enum usb_phy_events event;
 
        abx500_get_register_interruptible(ab->dev,
                        AB8500_USB,

diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index beeecc239d18aa056c656f293dfad4e633f7ca0e..906d524b94bbdf23012a1e8ec749c99af8709a99 100644 (file)
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -246,7 +246,7 @@ twl4030_usb_clear_bits(struct twl4030_usb *twl, u8 reg, u8 bits)
 
 /*-------------------------------------------------------------------------*/
 
-static enum usb_xceiv_events twl4030_usb_linkstat(struct twl4030_usb *twl)
+static enum usb_phy_events twl4030_usb_linkstat(struct twl4030_usb *twl)
 {
        int     status;
        int     linkstat = USB_EVENT_NONE;

diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index e0bc55702a89523b88998f801a844e2486dae9ac..723a000146f8e7950971ed6e7acc6f5db7f6c674 100644 (file)
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -35,7 +35,7 @@ enum usb_otg_state {
        OTG_STATE_A_VBUS_ERR,
 };
 
-enum usb_xceiv_events {
+enum usb_phy_events {
        USB_EVENT_NONE,         /* no events or cable disconnected */
        USB_EVENT_VBUS,         /* vbus valid event */
        USB_EVENT_ID,           /* id was grounded */
@@ -66,7 +66,7 @@ struct usb_phy {
 
        u8                      default_a;
        enum usb_otg_state      state;
-       enum usb_xceiv_events   last_event;
+       enum usb_phy_events     last_event;
 
        struct usb_bus          *host;
        struct usb_gadget       *gadget;
@@ -74,7 +74,7 @@ struct usb_phy {
        struct otg_io_access_ops        *io_ops;
        void __iomem                    *io_priv;
 
-       /* for notification of usb_xceiv_events */
+       /* for notification of usb_phy_events */
        struct atomic_notifier_head     notifier;
 
        /* to pass extra port status to the root hub */