diff options
author | Justin Waters <justin.waters@timesys.com> | 2008-02-26 13:07:02 -0500 |
---|---|---|
committer | Justin Waters <justin.waters@timesys.com> | 2008-02-26 13:07:02 -0500 |
commit | b80a32b9cc634adfa8eaef33ec981e7febf2ade2 (patch) | |
tree | f256bce13ba11f514a388160df84e1410bedbe2b /drivers/usb/gadget/arcotg_udc.c | |
parent | 594133ef22fae0d737bd1b57352cf3f48a192c63 (diff) |
Update the i.MX31 Kernel to 2.6.232.6.23-mx31ads-2008022618072.6.23-mx31-200802261807
This is the result of a brute-force attempt to update the kernel to 2.6.23.
Now that we have a git tree, our effort will be a little nicer in the future.
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'drivers/usb/gadget/arcotg_udc.c')
-rw-r--r-- | drivers/usb/gadget/arcotg_udc.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c index 7c3d19c2ee2f..ef4866136001 100644 --- a/drivers/usb/gadget/arcotg_udc.c +++ b/drivers/usb/gadget/arcotg_udc.c @@ -838,49 +838,6 @@ static void arcotg_free_request(struct usb_ep *_ep, struct usb_request *_req) kfree(req); } -/*! - * Allocate an I/O buffer for the ep->req->buf. - * @param _ep endpoint pointer - * @param bytes length of the desired buffer - * @param dma pointer to the buffer's DMA address; must be valid - * when gadget layer calls this function, ma is &req->dma - * @param gfp_flags GFP_* flags to use - * @return Returns a new buffer, or null if one could not be allocated - */ -static void *arcotg_alloc_buffer(struct usb_ep *_ep, unsigned bytes, - dma_addr_t * dma, gfp_t gfp_flags) -{ - void *retval = NULL; - - if (!bytes) - return 0; - - retval = kmalloc(bytes, gfp_flags); - - if (retval) - *dma = virt_to_phys(retval); - - pr_debug("udc: ep=%s buffer=0x%p dma=0x%x len=%d\n", - _ep->name, retval, *dma, bytes); - - return retval; -} - -/*! - * Free an I/O buffer for the ep->req->buf - * @param _ep endpoint pointer - * @param buf data buf pointer - * @param dma for 834x, we will not touch dma field - * @param bytes buffer size - */ -static void arcotg_free_buffer(struct usb_ep *_ep, void *buf, - dma_addr_t dma, unsigned bytes) -{ - pr_debug("udc: buf=0x%p dma=0x%x\n", buf, dma); - if (buf) - kfree(buf); -} - /*-------------------------------------------------------------------------*/ /*! @@ -1346,9 +1303,6 @@ static const struct usb_ep_ops arcotg_ep_ops = { .alloc_request = arcotg_alloc_request, .free_request = arcotg_free_request, - .alloc_buffer = arcotg_alloc_buffer, - .free_buffer = arcotg_free_buffer, - .queue = arcotg_ep_queue, .dequeue = arcotg_ep_dequeue, |