aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2012-02-13 06:24:03 -0500
committerFelipe Balbi <balbi@ti.com>2012-02-13 06:34:56 -0500
commitde07e18c00c403d5076a5a697d83fe3ced73bc30 (patch)
tree6356bf89b0f30b15ce29d7b7dba9a3b202df0167
parent8675381109b0eb1c948a423c2b35e3f4509cb25e (diff)
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>
-rw-r--r--drivers/usb/otg/ab8500-usb.c2
-rw-r--r--drivers/usb/otg/twl4030-usb.c2
-rw-r--r--include/linux/usb/otg.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/otg/ab8500-usb.c b/drivers/usb/otg/ab8500-usb.c
index 5f06dda7db61..b46a5fe178ef 100644
--- 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)
153 u8 reg; 153 u8 reg;
154 enum ab8500_usb_link_status lsts; 154 enum ab8500_usb_link_status lsts;
155 void *v = NULL; 155 void *v = NULL;
156 enum usb_xceiv_events event; 156 enum usb_phy_events event;
157 157
158 abx500_get_register_interruptible(ab->dev, 158 abx500_get_register_interruptible(ab->dev,
159 AB8500_USB, 159 AB8500_USB,
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index beeecc239d18..906d524b94bb 100644
--- 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)
246 246
247/*-------------------------------------------------------------------------*/ 247/*-------------------------------------------------------------------------*/
248 248
249static enum usb_xceiv_events twl4030_usb_linkstat(struct twl4030_usb *twl) 249static enum usb_phy_events twl4030_usb_linkstat(struct twl4030_usb *twl)
250{ 250{
251 int status; 251 int status;
252 int linkstat = USB_EVENT_NONE; 252 int linkstat = USB_EVENT_NONE;
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index e0bc55702a89..723a000146f8 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -35,7 +35,7 @@ enum usb_otg_state {
35 OTG_STATE_A_VBUS_ERR, 35 OTG_STATE_A_VBUS_ERR,
36}; 36};
37 37
38enum usb_xceiv_events { 38enum usb_phy_events {
39 USB_EVENT_NONE, /* no events or cable disconnected */ 39 USB_EVENT_NONE, /* no events or cable disconnected */
40 USB_EVENT_VBUS, /* vbus valid event */ 40 USB_EVENT_VBUS, /* vbus valid event */
41 USB_EVENT_ID, /* id was grounded */ 41 USB_EVENT_ID, /* id was grounded */
@@ -66,7 +66,7 @@ struct usb_phy {
66 66
67 u8 default_a; 67 u8 default_a;
68 enum usb_otg_state state; 68 enum usb_otg_state state;
69 enum usb_xceiv_events last_event; 69 enum usb_phy_events last_event;
70 70
71 struct usb_bus *host; 71 struct usb_bus *host;
72 struct usb_gadget *gadget; 72 struct usb_gadget *gadget;
@@ -74,7 +74,7 @@ struct usb_phy {
74 struct otg_io_access_ops *io_ops; 74 struct otg_io_access_ops *io_ops;
75 void __iomem *io_priv; 75 void __iomem *io_priv;
76 76
77 /* for notification of usb_xceiv_events */ 77 /* for notification of usb_phy_events */
78 struct atomic_notifier_head notifier; 78 struct atomic_notifier_head notifier;
79 79
80 /* to pass extra port status to the root hub */ 80 /* to pass extra port status to the root hub */