staging: emxx_udc: use common is_selfpowered

[deliverable/linux.git] / drivers / staging / emxx_udc / emxx_udc.c

diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
index ed8d86c98f6529ff4aa59bf5ab764af87461d369..1d3135a332586375cee786a404d8e8a3eb4a21c5 100644 (file)
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -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)
@@ -2622,7 +2622,7 @@ static int nbu2ss_ep_enable(
                return -EINVAL;
        }
 
-       ep_type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
+       ep_type = usb_endpoint_type(desc);
        if ((ep_type == USB_ENDPOINT_XFER_CONTROL)
                || (ep_type == USB_ENDPOINT_XFER_ISOC)) {
 
@@ -2644,7 +2644,7 @@ static int nbu2ss_ep_enable(
        spin_lock_irqsave(&udc->lock, flags);
 
        ep->desc = desc;
-       ep->epnum = desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+       ep->epnum = usb_endpoint_num(desc);
        ep->direct = desc->bEndpointAddress & USB_ENDPOINT_DIR_MASK;
        ep->ep_type = ep_type;
        ep->wedged = 0;
@@ -2722,8 +2722,7 @@ static void nbu2ss_ep_free_request(
        if (_req != NULL) {
                req = container_of(_req, struct nbu2ss_req, req);
 
-               if (req != NULL)
-                       kfree(req);
+               kfree(req);
        }
 }
 
@@ -3118,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__); */
@@ -3128,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;
@@ -3309,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;