1 files changed, 8 insertions, 83 deletions

diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index 06353e7ba1fb..24a924330c81 100644
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -767,56 +767,6 @@ static void fusb300_rdfifo(struct fusb300_ep *ep,
         } while (!reg);
 }
 
-/* write data to fifo */
-static void fusb300_wrfifo(struct fusb300_ep *ep,
-                           struct fusb300_request *req)
-{
-        int i = 0;
-        u8 *tmp;
-        u32 data, reg;
-        struct fusb300 *fusb300 = ep->fusb300;
-
-        tmp = req->req.buf;
-        req->req.actual = req->req.length;
-
-        for (i = (req->req.length >> 2); i > 0; i--) {
-                data = *tmp | *(tmp + 1) << 8 |
-                        *(tmp + 2) << 16 | *(tmp + 3) << 24;
-
-                iowrite32(data, fusb300->reg +
-                        FUSB300_OFFSET_EPPORT(ep->epnum));
-                tmp += 4;
-        }
-
-        switch (req->req.length % 4) {
-        case 1:
-                data = *tmp;
-                iowrite32(data, fusb300->reg +
-                        FUSB300_OFFSET_EPPORT(ep->epnum));
-                break;
-        case 2:
-                data = *tmp | *(tmp + 1) << 8;
-                iowrite32(data, fusb300->reg +
-                        FUSB300_OFFSET_EPPORT(ep->epnum));
-                break;
-        case 3:
-                data = *tmp | *(tmp + 1) << 8 | *(tmp + 2) << 16;
-                iowrite32(data, fusb300->reg +
-                        FUSB300_OFFSET_EPPORT(ep->epnum));
-                break;
-        default:
-                break;
-        }
-
-        do {
-                reg = ioread32(fusb300->reg + FUSB300_OFFSET_IGR1);
-                reg &= FUSB300_IGR1_SYNF0_EMPTY_INT;
-                if (i)
-                        printk(KERN_INFO"sync fifo is not empty!\n");
-                i++;
-        } while (!reg);
-}
-
 static u8 fusb300_get_epnstall(struct fusb300 *fusb300, u8 ep)
 {
         u8 value;
@@ -1024,17 +974,6 @@ static int setup_packet(struct fusb300 *fusb300, struct usb_ctrlrequest *ctrl)
         return ret;
 }
 
-static void fusb300_set_ep_bycnt(struct fusb300_ep *ep, u32 bycnt)
-{
-        struct fusb300 *fusb300 = ep->fusb300;
-        u32 reg = ioread32(fusb300->reg + FUSB300_OFFSET_EPFFR(ep->epnum));
-
-        reg &= ~FUSB300_FFR_BYCNT;
-        reg |= bycnt & FUSB300_FFR_BYCNT;
-
-        iowrite32(reg, fusb300->reg + FUSB300_OFFSET_EPFFR(ep->epnum));
-}
-
 static void done(struct fusb300_ep *ep, struct fusb300_request *req,
                  int status)
 {
@@ -1058,8 +997,8 @@ static void done(struct fusb300_ep *ep, struct fusb300_request *req,
                 fusb300_set_cxdone(ep->fusb300);
 }
 
-void fusb300_fill_idma_prdtbl(struct fusb300_ep *ep,
-                        struct fusb300_request *req)
+static void fusb300_fill_idma_prdtbl(struct fusb300_ep *ep, dma_addr_t d,
+                u32 len)
 {
         u32 value;
         u32 reg;
@@ -1071,10 +1010,9 @@ void fusb300_fill_idma_prdtbl(struct fusb300_ep *ep,
                 reg &= FUSB300_EPPRD0_H;
         } while (reg);
 
-        iowrite32((u32) req->req.buf, ep->fusb300->reg +
-                FUSB300_OFFSET_EPPRD_W1(ep->epnum));
+        iowrite32(d, ep->fusb300->reg + FUSB300_OFFSET_EPPRD_W1(ep->epnum));
 
-        value = FUSB300_EPPRD0_BTC(req->req.length) | FUSB300_EPPRD0_H |
+        value = FUSB300_EPPRD0_BTC(len) | FUSB300_EPPRD0_H |
                 FUSB300_EPPRD0_F | FUSB300_EPPRD0_L | FUSB300_EPPRD0_I;
         iowrite32(value, ep->fusb300->reg + FUSB300_OFFSET_EPPRD_W0(ep->epnum));
 
@@ -1111,13 +1049,12 @@ static void  fusb300_set_idma(struct fusb300_ep *ep,
                         struct fusb300_request *req)
 {
         dma_addr_t d;
-        u8 *tmp = NULL;
 
         d = dma_map_single(NULL, req->req.buf, req->req.length, DMA_TO_DEVICE);
 
         if (dma_mapping_error(NULL, d)) {
-                kfree(req->req.buf);
                 printk(KERN_DEBUG "dma_mapping_error\n");
+                return;
         }
 
         dma_sync_single_for_device(NULL, d, req->req.length, DMA_TO_DEVICE);
@@ -1125,17 +1062,11 @@ static void  fusb300_set_idma(struct fusb300_ep *ep,
         fusb300_enable_bit(ep->fusb300, FUSB300_OFFSET_IGER0,
                 FUSB300_IGER0_EEPn_PRD_INT(ep->epnum));
 
-        tmp = req->req.buf;
-        req->req.buf = (u8 *)d;
-
-        fusb300_fill_idma_prdtbl(ep, req);
+        fusb300_fill_idma_prdtbl(ep, d, req->req.length);
         /* check idma is done */
         fusb300_wait_idma_finished(ep);
 
-        req->req.buf = tmp;
-
-        if (d)
-                dma_unmap_single(NULL, d, req->req.length, DMA_TO_DEVICE);
+        dma_unmap_single(NULL, d, req->req.length, DMA_TO_DEVICE);
 }
 
 static void in_ep_fifo_handler(struct fusb300_ep *ep)
@@ -1143,14 +1074,8 @@ static void in_ep_fifo_handler(struct fusb300_ep *ep)
         struct fusb300_request *req = list_entry(ep->queue.next,
                                         struct fusb300_request, queue);
 
-        if (req->req.length) {
-#if 0
-                fusb300_set_ep_bycnt(ep, req->req.length);
-                fusb300_wrfifo(ep, req);
-#else
+        if (req->req.length)
                 fusb300_set_idma(ep, req);
-#endif
-        }
         done(ep, req, 0);
 }