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

Commit 77e012ac authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Felipe Balbi
Browse files

usb: phy: generic: remove the vbus dependency 



As the last known user, ie. pxa27x_udc relying on calls to
usb_gadget_xxx() was amended to use the phy notifier, remove a bit the
USB stack adherence.

Actually the driver still uses the gadget API for structures definition,
but the implementation of USB gadget specific function usb_gadget_*() is
not necessary anymore.

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 9835a6ef

drivers/usb/phy/phy-generic.c

+2 −5
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ static irqreturn_t nop_gpio_vbus_thread(int irq, void *data) 
		status = USB_EVENT_VBUS;

		otg->state = OTG_STATE_B_PERIPHERAL;

		nop->phy.last_event = status;

		if (otg->gadget)

			usb_gadget_vbus_connect(otg->gadget);



		/* drawing a "unit load" is *always* OK, except for OTG */

		nop_set_vbus_draw(nop, 100);
@@ -129,8 +127,6 @@ static irqreturn_t nop_gpio_vbus_thread(int irq, void *data) 
	} else {

		nop_set_vbus_draw(nop, 0);



		if (otg->gadget)

			usb_gadget_vbus_disconnect(otg->gadget);

		status = USB_EVENT_NONE;

		otg->state = OTG_STATE_B_IDLE;

		nop->phy.last_event = status;
@@ -187,7 +183,8 @@ static int nop_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget) 


	otg->gadget = gadget;

	if (otg->state == OTG_STATE_B_PERIPHERAL)

		usb_gadget_vbus_connect(gadget);

		atomic_notifier_call_chain(&otg->usb_phy->notifier,

					   USB_EVENT_VBUS, otg->gadget);

	else

		otg->state = OTG_STATE_B_IDLE;

	return 0;