aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/udc
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2015-01-28 03:32:35 -0500
committerFelipe Balbi <balbi@ti.com>2015-01-29 11:35:18 -0500
commitc8678d9f288e7df66f50ab7be1eff1beb6bc7d70 (patch)
treef4d2cead325e10b8f80572aca2d5f6c05f9e28e7 /drivers/usb/gadget/udc
parent0bcff9eaa83228f36b8ae42cedc588e9337b7e71 (diff)
usb: gadget: net2280: use common is_selfpowered
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>
Diffstat (limited to 'drivers/usb/gadget/udc')
-rw-r--r--drivers/usb/gadget/udc/net2280.c6
-rw-r--r--drivers/usb/gadget/udc/net2280.h1
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index 6411ed8e14bc..d2c0bf65e345 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -1365,10 +1365,10 @@ static int net2280_set_selfpowered(struct usb_gadget *_gadget, int value)
1365 tmp = readl(&dev->usb->usbctl); 1365 tmp = readl(&dev->usb->usbctl);
1366 if (value) { 1366 if (value) {
1367 tmp |= BIT(SELF_POWERED_STATUS); 1367 tmp |= BIT(SELF_POWERED_STATUS);
1368 dev->selfpowered = 1; 1368 _gadget->is_selfpowered = 1;
1369 } else { 1369 } else {
1370 tmp &= ~BIT(SELF_POWERED_STATUS); 1370 tmp &= ~BIT(SELF_POWERED_STATUS);
1371 dev->selfpowered = 0; 1371 _gadget->is_selfpowered = 0;
1372 } 1372 }
1373 writel(tmp, &dev->usb->usbctl); 1373 writel(tmp, &dev->usb->usbctl);
1374 spin_unlock_irqrestore(&dev->lock, flags); 1374 spin_unlock_irqrestore(&dev->lock, flags);
@@ -2611,7 +2611,7 @@ static void handle_stat0_irqs_superspeed(struct net2280 *dev,
2611 switch (r.bRequestType) { 2611 switch (r.bRequestType) {
2612 case (USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE): 2612 case (USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE):
2613 status = dev->wakeup_enable ? 0x02 : 0x00; 2613 status = dev->wakeup_enable ? 0x02 : 0x00;
2614 if (dev->selfpowered) 2614 if (dev->gadget.is_selfpowered)
2615 status |= BIT(0); 2615 status |= BIT(0);
2616 status |= (dev->u1_enable << 2 | dev->u2_enable << 3 | 2616 status |= (dev->u1_enable << 2 | dev->u2_enable << 3 |
2617 dev->ltm_enable << 4); 2617 dev->ltm_enable << 4);
diff --git a/drivers/usb/gadget/udc/net2280.h b/drivers/usb/gadget/udc/net2280.h
index a307dce2e184..ac8d5a20a378 100644
--- a/drivers/usb/gadget/udc/net2280.h
+++ b/drivers/usb/gadget/udc/net2280.h
@@ -164,7 +164,6 @@ struct net2280 {
164 u2_enable:1, 164 u2_enable:1,
165 ltm_enable:1, 165 ltm_enable:1,
166 wakeup_enable:1, 166 wakeup_enable:1,
167 selfpowered:1,
168 addressed_state:1, 167 addressed_state:1,
169 bug7734_patched:1; 168 bug7734_patched:1;
170 u16 chiprev; 169 u16 chiprev;