iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: emxx_udc: use common is_selfpowered

Browse Source 
Delete private selfpowered variable, and use common one.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Peter Chen 2015-01-28 16:32:27 +08:00 committed by Felipe Balbi
parent 7301971f50
commit 9239d88fc5
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/emxx_udc/emxx_udc.c
View File

@ -1608,7 +1608,7 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
switch (recipient) { switch (recipient) {
case USB_RECIP_DEVICE: case USB_RECIP_DEVICE:
if (udc->ctrl.wIndex == 0x0000) { if (udc->ctrl.wIndex == 0x0000) {
if (udc->self_powered) if (udc->gadget.is_selfpowered)
status_data |= (1 << USB_DEVICE_SELF_POWERED); status_data |= (1 << USB_DEVICE_SELF_POWERED);
if (udc->remote_wakeup) 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, static int nbu2ss_gad_set_selfpowered(struct usb_gadget *pgadget,
int is_selfpowered) int is_selfpowered)
{ {
struct nbu2ss_udc *udc;
unsigned long flags; unsigned long flags;
/* INFO("=== %s()\n", __func__); */ /* INFO("=== %s()\n", __func__); */
@ -3127,10 +3126,8 @@ static int nbu2ss_gad_set_selfpowered(struct usb_gadget *pgadget,
return -EINVAL; return -EINVAL;
} }
udc = container_of(pgadget, struct nbu2ss_udc, gadget);
spin_lock_irqsave(&udc->lock, flags); spin_lock_irqsave(&udc->lock, flags);
udc->self_powered = (is_selfpowered != 0); pgadget->is_selfpowered = (is_selfpowered != 0);
spin_unlock_irqrestore(&udc->lock, flags); spin_unlock_irqrestore(&udc->lock, flags);
return 0; return 0;
@ -3308,7 +3305,7 @@ static int __init nbu2ss_drv_contest_init(
spin_lock_init(&udc->lock); spin_lock_init(&udc->lock);
udc->dev = &pdev->dev; udc->dev = &pdev->dev;
udc->self_powered = 1; udc->gadget.is_selfpowered = 1;
udc->devstate = USB_STATE_NOTATTACHED; udc->devstate = USB_STATE_NOTATTACHED;
udc->pdev = pdev; udc->pdev = pdev;
udc->mA = 0; udc->mA = 0;

1
drivers/staging/emxx_udc/emxx_udc.h
View File

@ -624,7 +624,6 @@ struct nbu2ss_udc {
unsigned linux_suspended:1; unsigned linux_suspended:1;
unsigned linux_resume:1; unsigned linux_resume:1;
unsigned usb_suspended:1; unsigned usb_suspended:1;
unsigned self_powered:1;
unsigned remote_wakeup:1; unsigned remote_wakeup:1;
unsigned udc_enabled:1; unsigned udc_enabled:1;