Merge tag 'v3.17-rc4' into next

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / udc / r8a66597-udc.c

diff --git a/drivers/usb/gadget/udc/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c
index de2a8713b42884994cafda67990e06a2e93fcb23..de9c400b9944a6de45ea3d6223efa0d848e86847 100644 (file)
--- a/drivers/usb/gadget/udc/r8a66597-udc.c
+++ b/drivers/usb/gadget/udc/r8a66597-udc.c
@@ -430,7 +430,7 @@ static void r8a66597_ep_setting(struct r8a66597 *r8a66597,
        ep->pipenum = pipenum;
        ep->ep.maxpacket = usb_endpoint_maxp(desc);
        r8a66597->pipenum2ep[pipenum] = ep;
-       r8a66597->epaddr2ep[desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK]
+       r8a66597->epaddr2ep[usb_endpoint_num(desc)]
                = ep;
        INIT_LIST_HEAD(&ep->queue);
 }
@@ -464,7 +464,7 @@ static int alloc_pipe_config(struct r8a66597_ep *ep,
        if (ep->pipenum)        /* already allocated pipe  */
                return 0;
 
-       switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) {
+       switch (usb_endpoint_type(desc)) {
        case USB_ENDPOINT_XFER_BULK:
                if (r8a66597->bulk >= R8A66597_MAX_NUM_BULK) {
                        if (r8a66597->isochronous >= R8A66597_MAX_NUM_ISOC) {
@@ -509,7 +509,7 @@ static int alloc_pipe_config(struct r8a66597_ep *ep,
        }
        ep->type = info.type;
 
-       info.epnum = desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+       info.epnum = usb_endpoint_num(desc);
        info.maxpacket = usb_endpoint_maxp(desc);
        info.interval = desc->bInterval;
        if (desc->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
@@ -1846,10 +1846,8 @@ static int r8a66597_sudmac_ioremap(struct r8a66597 *r8a66597,
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sudmac");
        r8a66597->sudmac_reg = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(r8a66597->sudmac_reg)) {
-               dev_err(&pdev->dev, "ioremap error(sudmac).\n");
+       if (IS_ERR(r8a66597->sudmac_reg))
                return PTR_ERR(r8a66597->sudmac_reg);
-       }
 
        return 0;
 }