Revert "usb: gadget: udc-xilinx: replace memcpy with memcpy_toio"

[ Upstream commit fe0a2ac7c627b064c479ad0c3b25e531d342e048 ]

This reverts commit 8cb339f1c1f04baede9d54c1e40ac96247a6393b as it
throws up a bunch of sparse warnings as reported by the kernel test
robot.

Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/202209020044.CX2PfZzM-lkp@intel.com
Fixes: 8cb339f1c1f0 ("usb: gadget: udc-xilinx: replace memcpy with memcpy_toio")
Cc: stable@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Piyush Mehta <piyush.mehta@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c
index 218d9423807a8f1581353f3f781d1790b8b97eda..9cf43731bcd182592fb47ccd411dc31c8cc76ece 100644 (file)
--- a/drivers/usb/gadget/udc/udc-xilinx.c
+++ b/drivers/usb/gadget/udc/udc-xilinx.c
@@ -496,11 +496,11 @@ static int xudc_eptxrx(struct xusb_ep *ep, struct xusb_req *req,
                /* Get the Buffer address and copy the transmit data.*/
                eprambase = (u32 __force *)(udc->addr + ep->rambase);
                if (ep->is_in) {
-                       memcpy_toio(eprambase, bufferptr, bytestosend);
+                       memcpy(eprambase, bufferptr, bytestosend);
                        udc->write_fn(udc->addr, ep->offset +
                                      XUSB_EP_BUF0COUNT_OFFSET, bufferlen);
                } else {
-                       memcpy_toio(bufferptr, eprambase, bytestosend);
+                       memcpy(bufferptr, eprambase, bytestosend);
                }
                /*
                 * Enable the buffer for transmission.
@@ -514,11 +514,11 @@ static int xudc_eptxrx(struct xusb_ep *ep, struct xusb_req *req,
                eprambase = (u32 __force *)(udc->addr + ep->rambase +
                             ep->ep_usb.maxpacket);
                if (ep->is_in) {
-                       memcpy_toio(eprambase, bufferptr, bytestosend);
+                       memcpy(eprambase, bufferptr, bytestosend);
                        udc->write_fn(udc->addr, ep->offset +
                                      XUSB_EP_BUF1COUNT_OFFSET, bufferlen);
                } else {
-                       memcpy_toio(bufferptr, eprambase, bytestosend);
+                       memcpy(bufferptr, eprambase, bytestosend);
                }
                /*
                 * Enable the buffer for transmission.
@@ -1020,7 +1020,7 @@ static int __xudc_ep0_queue(struct xusb_ep *ep0, struct xusb_req *req)
                           udc->addr);
                length = req->usb_req.actual = min_t(u32, length,
                                                     EP0_MAX_PACKET);
-               memcpy_toio(corebuf, req->usb_req.buf, length);
+               memcpy(corebuf, req->usb_req.buf, length);
                udc->write_fn(udc->addr, XUSB_EP_BUF0COUNT_OFFSET, length);
                udc->write_fn(udc->addr, XUSB_BUFFREADY_OFFSET, 1);
        } else {
@@ -1746,7 +1746,7 @@ static void xudc_handle_setup(struct xusb_udc *udc)
 
        /* Load up the chapter 9 command buffer.*/
        ep0rambase = (u32 __force *) (udc->addr + XUSB_SETUP_PKT_ADDR_OFFSET);
-       memcpy_toio(&setup, ep0rambase, 8);
+       memcpy(&setup, ep0rambase, 8);
 
        udc->setup = setup;
        udc->setup.wValue = cpu_to_le16(setup.wValue);
@@ -1833,7 +1833,7 @@ static void xudc_ep0_out(struct xusb_udc *udc)
                             (ep0->rambase << 2));
                buffer = req->usb_req.buf + req->usb_req.actual;
                req->usb_req.actual = req->usb_req.actual + bytes_to_rx;
-               memcpy_toio(buffer, ep0rambase, bytes_to_rx);
+               memcpy(buffer, ep0rambase, bytes_to_rx);
 
                if (req->usb_req.length == req->usb_req.actual) {
                        /* Data transfer completed get ready for Status stage */
@@ -1909,7 +1909,7 @@ static void xudc_ep0_in(struct xusb_udc *udc)
                                     (ep0->rambase << 2));
                        buffer = req->usb_req.buf + req->usb_req.actual;
                        req->usb_req.actual = req->usb_req.actual + length;
-                       memcpy_toio(ep0rambase, buffer, length);
+                       memcpy(ep0rambase, buffer, length);
                }
                udc->write_fn(udc->addr, XUSB_EP_BUF0COUNT_OFFSET, count);
                udc->write_fn(udc->addr, XUSB_BUFFREADY_OFFSET, 1);