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>

diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index 6411ed8e14bcd4a4830889a90b01a06ab9932253..d2c0bf65e345fb55b288cbc1274fa3c8a2b92aed 100644 (file)
--- 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)
        tmp = readl(&dev->usb->usbctl);
        if (value) {
                tmp |= BIT(SELF_POWERED_STATUS);
-               dev->selfpowered = 1;
+               _gadget->is_selfpowered = 1;
        } else {
                tmp &= ~BIT(SELF_POWERED_STATUS);
-               dev->selfpowered = 0;
+               _gadget->is_selfpowered = 0;
        }
        writel(tmp, &dev->usb->usbctl);
        spin_unlock_irqrestore(&dev->lock, flags);
@@ -2611,7 +2611,7 @@ static void handle_stat0_irqs_superspeed(struct net2280 *dev,
                switch (r.bRequestType) {
                case (USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE):
                        status = dev->wakeup_enable ? 0x02 : 0x00;
-                       if (dev->selfpowered)
+                       if (dev->gadget.is_selfpowered)
                                status |= BIT(0);
                        status |= (dev->u1_enable << 2 | dev->u2_enable << 3 |
                                                        dev->ltm_enable << 4);

diff --git a/drivers/usb/gadget/udc/net2280.h b/drivers/usb/gadget/udc/net2280.h
index a307dce2e1849c03fcdb8839444d30cef32997c4..ac8d5a20a378a9de074901b8667bb721f8e86cdc 100644 (file)
--- a/drivers/usb/gadget/udc/net2280.h
+++ b/drivers/usb/gadget/udc/net2280.h
@@ -164,7 +164,6 @@ struct net2280 {
                                        u2_enable:1,
                                        ltm_enable:1,
                                        wakeup_enable:1,
-                                       selfpowered:1,
                                        addressed_state:1,
                                        bug7734_patched:1;
        u16                             chiprev;