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

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

staging: emxx_udc: 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 7301971f

drivers/staging/emxx_udc/emxx_udc.c

+3 −6
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ static int std_req_get_status(struct nbu2ss_udc *udc) 
	switch (recipient) {

	case USB_RECIP_DEVICE:

		if (udc->ctrl.wIndex == 0x0000) {

			if (udc->self_powered)

			if (udc->gadget.is_selfpowered)

				status_data |= (1 << USB_DEVICE_SELF_POWERED);



			if (udc->remote_wakeup)
@@ -3117,7 +3117,6 @@ static int nbu2ss_gad_wakeup(struct usb_gadget *pgadget) 
static int nbu2ss_gad_set_selfpowered(struct usb_gadget *pgadget,

					int is_selfpowered)

{

	struct nbu2ss_udc	*udc;

	unsigned long		flags;



/*	INFO("=== %s()\n", __func__); */
@@ -3127,10 +3126,8 @@ static int nbu2ss_gad_set_selfpowered(struct usb_gadget *pgadget, 
		return -EINVAL;

	}



	udc = container_of(pgadget, struct nbu2ss_udc, gadget);



	spin_lock_irqsave(&udc->lock, flags);

	udc->self_powered = (is_selfpowered != 0);

	pgadget->is_selfpowered = (is_selfpowered != 0);

	spin_unlock_irqrestore(&udc->lock, flags);



	return 0;
@@ -3308,7 +3305,7 @@ static int __init nbu2ss_drv_contest_init( 
	spin_lock_init(&udc->lock);

	udc->dev = &pdev->dev;



	udc->self_powered = 1;

	udc->gadget.is_selfpowered = 1;

	udc->devstate = USB_STATE_NOTATTACHED;

	udc->pdev = pdev;

	udc->mA = 0;

drivers/staging/emxx_udc/emxx_udc.h

+0 −1
Original line number Diff line number Diff line
@@ -624,7 +624,6 @@ struct nbu2ss_udc { 
	unsigned		linux_suspended:1;

	unsigned		linux_resume:1;

	unsigned		usb_suspended:1;

	unsigned		self_powered:1;

	unsigned		remote_wakeup:1;

	unsigned		udc_enabled:1;