leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: gadget: net2280: 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:35 +08:00 committed by Felipe Balbi
parent 0bcff9eaa8
commit c8678d9f28
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/gadget/udc/net2280.c
View File

@ -1365,10 +1365,10 @@ static int net2280_set_selfpowered(struct usb_gadget *_gadget, int value)
tmp = readl(&dev->usb->usbctl); tmp = readl(&dev->usb->usbctl);
if (value) { if (value) {
tmp |= BIT(SELF_POWERED_STATUS); tmp |= BIT(SELF_POWERED_STATUS);
dev->selfpowered = 1; _gadget->is_selfpowered = 1;
} else { } else {
tmp &= ~BIT(SELF_POWERED_STATUS); tmp &= ~BIT(SELF_POWERED_STATUS);
dev->selfpowered = 0; _gadget->is_selfpowered = 0;
} }
writel(tmp, &dev->usb->usbctl); writel(tmp, &dev->usb->usbctl);
spin_unlock_irqrestore(&dev->lock, flags); spin_unlock_irqrestore(&dev->lock, flags);
@ -2611,7 +2611,7 @@ static void handle_stat0_irqs_superspeed(struct net2280 *dev,
switch (r.bRequestType) { switch (r.bRequestType) {
case (USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE): case (USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE):
status = dev->wakeup_enable ? 0x02 : 0x00; status = dev->wakeup_enable ? 0x02 : 0x00;
if (dev->selfpowered) if (dev->gadget.is_selfpowered)
status |= BIT(0); status |= BIT(0);
status |= (dev->u1_enable << 2 | dev->u2_enable << 3 | status |= (dev->u1_enable << 2 | dev->u2_enable << 3 |
dev->ltm_enable << 4); dev->ltm_enable << 4);

1
drivers/usb/gadget/udc/net2280.h
View File

@ -164,7 +164,6 @@ struct net2280 {
u2_enable:1, u2_enable:1,
ltm_enable:1, ltm_enable:1,
wakeup_enable:1, wakeup_enable:1,
selfpowered:1,
addressed_state:1, addressed_state:1,
bug7734_patched:1; bug7734_patched:1;
u16 chiprev; u16 chiprev;