Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (149 commits)
  USB: ohci-pnx4008: Remove unnecessary cast of return value of kzalloc
  USB: additions to the quirk list
  usb-storage: implement autosuspend
  USB: cdc-acm: add new device id to option driver
  USB: goku_udc trivial cleanups
  USB: usb gadget stack can now -DDEBUG with Kconfig
  usb gadget stack: remove usb_ep_*_buffer(), part 2
  usb gadget stack: remove usb_ep_*_buffer(), part 1
  USB: pxa2xx_udc -- cleanups, mostly removing dma hooks
  USB: pxa2xx_udc: use generic gpio layer
  USB: quirk for samsung printer
  USB: usb/dma doc updates
  USB: drivers/usb/storage/unusual_devs.h whitespace cleanup
  USB: remove Makefile reference to obsolete OHCI_AT91
  USB: io_*: remove bogus termios no change checks
  USB: mos7720: remove bogus no termios change check
  USB: visor and whiteheat: remove bogus termios change checks
  USB: pl2303: remove bogus checks and fix speed support to use tty_get_baud_rate()
  USB: mos7840.c: turn this into a serial driver
  USB: make the usb_device numa_node get assigned from controller
  ...

1 files changed, 0 insertions, 97 deletions

diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 00fda334dc72..c3d364ecd4f8 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -450,100 +450,6 @@ net2280_free_request (struct usb_ep *_ep, struct usb_request *_req)
 
 /*-------------------------------------------------------------------------*/
 
-/*
- * dma-coherent memory allocation (for dma-capable endpoints)
- *
- * NOTE: the dma_*_coherent() API calls suck.  Most implementations are
- * (a) page-oriented, so small buffers lose big; and (b) asymmetric with
- * respect to calls with irqs disabled:  alloc is safe, free is not.
- * We currently work around (b), but not (a).
- */
-
-static void *
-net2280_alloc_buffer (
-        struct usb_ep           *_ep,
-        unsigned                bytes,
-        dma_addr_t              *dma,
-        gfp_t                   gfp_flags
-)
-{
-        void                    *retval;
-        struct net2280_ep       *ep;
-
-        ep = container_of (_ep, struct net2280_ep, ep);
-        if (!_ep)
-                return NULL;
-        *dma = DMA_ADDR_INVALID;
-
-        if (ep->dma)
-                retval = dma_alloc_coherent(&ep->dev->pdev->dev,
-                                bytes, dma, gfp_flags);
-        else
-                retval = kmalloc(bytes, gfp_flags);
-        return retval;
-}
-
-static DEFINE_SPINLOCK(buflock);
-static LIST_HEAD(buffers);
-
-struct free_record {
-        struct list_head        list;
-        struct device           *dev;
-        unsigned                bytes;
-        dma_addr_t              dma;
-};
-
-static void do_free(unsigned long ignored)
-{
-        spin_lock_irq(&buflock);
-        while (!list_empty(&buffers)) {
-                struct free_record      *buf;
-
-                buf = list_entry(buffers.next, struct free_record, list);
-                list_del(&buf->list);
-                spin_unlock_irq(&buflock);
-
-                dma_free_coherent(buf->dev, buf->bytes, buf, buf->dma);
-
-                spin_lock_irq(&buflock);
-        }
-        spin_unlock_irq(&buflock);
-}
-
-static DECLARE_TASKLET(deferred_free, do_free, 0);
-
-static void
-net2280_free_buffer (
-        struct usb_ep *_ep,
-        void *address,
-        dma_addr_t dma,
-        unsigned bytes
-) {
-        /* free memory into the right allocator */
-        if (dma != DMA_ADDR_INVALID) {
-                struct net2280_ep       *ep;
-                struct free_record      *buf = address;
-                unsigned long           flags;
-
-                ep = container_of(_ep, struct net2280_ep, ep);
-                if (!_ep)
-                        return;
-
-                ep = container_of (_ep, struct net2280_ep, ep);
-                buf->dev = &ep->dev->pdev->dev;
-                buf->bytes = bytes;
-                buf->dma = dma;
-
-                spin_lock_irqsave(&buflock, flags);
-                list_add_tail(&buf->list, &buffers);
-                tasklet_schedule(&deferred_free);
-                spin_unlock_irqrestore(&buflock, flags);
-        } else
-                kfree (address);
-}
-
-/*-------------------------------------------------------------------------*/
-
 /* load a packet into the fifo we use for usb IN transfers.
  * works for all endpoints.
  *
@@ -1392,9 +1298,6 @@ static const struct usb_ep_ops net2280_ep_ops = {
         .alloc_request  = net2280_alloc_request,
         .free_request   = net2280_free_request,
 
-        .alloc_buffer   = net2280_alloc_buffer,
-        .free_buffer    = net2280_free_buffer,
-
         .queue          = net2280_queue,
         .dequeue        = net2280_dequeue,