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

Commit dadac986 authored by Peter Chen's avatar Peter Chen Committed by Felipe Balbi
Browse files

usb: musb: gadget: use common is_selfpowered 



Delete private selfpowered variable, and use common one.

Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent bcdea503

drivers/usb/musb/musb_gadget.c

+1 −3
Original line number Diff line number Diff line
@@ -1612,9 +1612,7 @@ static int musb_gadget_wakeup(struct usb_gadget *gadget) 
static int

musb_gadget_set_self_powered(struct usb_gadget *gadget, int is_selfpowered)

{

	struct musb	*musb = gadget_to_musb(gadget);



	musb->is_self_powered = !!is_selfpowered;

	gadget->is_selfpowered = !!is_selfpowered;

	return 0;

}

drivers/usb/musb/musb_gadget_ep0.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int service_tx_status_request( 


	switch (recip) {

	case USB_RECIP_DEVICE:

		result[0] = musb->is_self_powered << USB_DEVICE_SELF_POWERED;

		result[0] = musb->g.is_selfpowered << USB_DEVICE_SELF_POWERED;

		result[0] |= musb->may_wakeup << USB_DEVICE_REMOTE_WAKEUP;

		if (musb->g.is_otg) {

			result[0] |= musb->g.b_hnp_enable