Merge tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-microblaze.git] / drivers / usb / gadget / udc / udc-xilinx.c

diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c
index a4a7b90..56b8286 100644 (file)
--- a/drivers/usb/gadget/udc/udc-xilinx.c
+++ b/drivers/usb/gadget/udc/udc-xilinx.c
@@ -18,10 +18,8 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/of_address.h>
-#include <linux/of_device.h>
-#include <linux/of_platform.h>
-#include <linux/of_irq.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
 #include <linux/prefetch.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -1617,13 +1615,13 @@ static void xudc_getstatus(struct xusb_udc *udc)
        case USB_RECIP_INTERFACE:
                break;
        case USB_RECIP_ENDPOINT:
-               epnum = udc->setup.wIndex & USB_ENDPOINT_NUMBER_MASK;
+               epnum = le16_to_cpu(udc->setup.wIndex) & USB_ENDPOINT_NUMBER_MASK;
                if (epnum >= XUSB_MAX_ENDPOINTS)
                        goto stall;
                target_ep = &udc->ep[epnum];
                epcfgreg = udc->read_fn(udc->addr + target_ep->offset);
                halt = epcfgreg & XUSB_EP_CFG_STALL_MASK;
-               if (udc->setup.wIndex & USB_DIR_IN) {
+               if (le16_to_cpu(udc->setup.wIndex) & USB_DIR_IN) {
                        if (!target_ep->is_in)
                                goto stall;
                } else {
@@ -1638,7 +1636,7 @@ static void xudc_getstatus(struct xusb_udc *udc)
        }
 
        req->usb_req.length = 2;
-       *(u16 *)req->usb_req.buf = cpu_to_le16(status);
+       *(__le16 *)req->usb_req.buf = cpu_to_le16(status);
        ret = __xudc_ep0_queue(ep0, req);
        if (ret == 0)
                return;
@@ -1666,7 +1664,7 @@ static void xudc_set_clear_feature(struct xusb_udc *udc)
 
        switch (udc->setup.bRequestType) {
        case USB_RECIP_DEVICE:
-               switch (udc->setup.wValue) {
+               switch (le16_to_cpu(udc->setup.wValue)) {
                case USB_DEVICE_TEST_MODE:
                        /*
                         * The Test Mode will be executed
@@ -1686,13 +1684,15 @@ static void xudc_set_clear_feature(struct xusb_udc *udc)
                break;
        case USB_RECIP_ENDPOINT:
                if (!udc->setup.wValue) {
-                       endpoint = udc->setup.wIndex & USB_ENDPOINT_NUMBER_MASK;
+                       endpoint = le16_to_cpu(udc->setup.wIndex) &
+                                              USB_ENDPOINT_NUMBER_MASK;
                        if (endpoint >= XUSB_MAX_ENDPOINTS) {
                                xudc_ep0_stall(udc);
                                return;
                        }
                        target_ep = &udc->ep[endpoint];
-                       outinbit = udc->setup.wIndex & USB_ENDPOINT_DIR_MASK;
+                       outinbit = le16_to_cpu(udc->setup.wIndex) &
+                                              USB_ENDPOINT_DIR_MASK;
                        outinbit = outinbit >> 7;
 
                        /* Make sure direction matches.*/
@@ -1755,9 +1755,9 @@ static void xudc_handle_setup(struct xusb_udc *udc)
        memcpy(&setup, ep0rambase, 8);
 
        udc->setup = setup;
-       udc->setup.wValue = cpu_to_le16(setup.wValue);
-       udc->setup.wIndex = cpu_to_le16(setup.wIndex);
-       udc->setup.wLength = cpu_to_le16(setup.wLength);
+       udc->setup.wValue = cpu_to_le16((u16 __force)setup.wValue);
+       udc->setup.wIndex = cpu_to_le16((u16 __force)setup.wIndex);
+       udc->setup.wLength = cpu_to_le16((u16 __force)setup.wLength);
 
        /* Clear previous requests */
        xudc_nuke(ep0, -ECONNRESET);
@@ -1869,7 +1869,7 @@ static void xudc_ep0_in(struct xusb_udc *udc)
        u16 count = 0;
        u16 length;
        u8 *ep0rambase;
-       u8 test_mode = udc->setup.wIndex >> 8;
+       u8 test_mode = le16_to_cpu(udc->setup.wIndex) >> 8;
 
        req = list_first_entry(&ep0->queue, struct xusb_req, queue);
        bytes_to_tx = req->usb_req.length - req->usb_req.actual;
@@ -1880,12 +1880,12 @@ static void xudc_ep0_in(struct xusb_udc *udc)
                case USB_REQ_SET_ADDRESS:
                        /* Set the address of the device.*/
                        udc->write_fn(udc->addr, XUSB_ADDRESS_OFFSET,
-                                     udc->setup.wValue);
+                                     le16_to_cpu(udc->setup.wValue));
                        break;
                case USB_REQ_SET_FEATURE:
                        if (udc->setup.bRequestType ==
                                        USB_RECIP_DEVICE) {
-                               if (udc->setup.wValue ==
+                               if (le16_to_cpu(udc->setup.wValue) ==
                                                USB_DEVICE_TEST_MODE)
                                        udc->write_fn(udc->addr,
                                                      XUSB_TESTMODE_OFFSET,
@@ -2080,8 +2080,7 @@ static int xudc_probe(struct platform_device *pdev)
        udc->req->usb_req.buf = buff;
 
        /* Map the registers */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       udc->addr = devm_ioremap_resource(&pdev->dev, res);
+       udc->addr = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
        if (IS_ERR(udc->addr))
                return PTR_ERR(udc->addr);