Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de07e18c authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Felipe Balbi
Browse files

usb: otg: Rename usb_xceiv_event to usb_phy_event 



Convert all users.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 86753811

drivers/usb/otg/ab8500-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/usb/otg/twl4030-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/usb/otg.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */