From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 6 Oct 2013 19:22:30 +0000 (+0300)
Subject: staging: octeon-usb: cvmx_usb_submit_bulk: get params from urb
X-Git-Tag: v3.13-rc1~170^2~445
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9ccca707183f2b425842db6624dd7ba6c7484762;p=linux.git

staging: octeon-usb: cvmx_usb_submit_bulk: get params from urb

Get the transfer parameters from urb.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c
index 9ae8c1d4e980..255503938a1a 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -2402,34 +2402,20 @@ static int __cvmx_usb_submit_transaction(struct cvmx_usb_state *usb,
  * @usb:	    USB device state populated by cvmx_usb_initialize().
  * @pipe_handle:
  *		    Handle to the pipe for the transfer.
- * @buffer:	    Physical address of the data buffer in
- *		    memory. Note that this is NOT A POINTER, but
- *		    the full 64bit physical address of the
- *		    buffer. This may be zero if buffer_length is
- *		    zero.
- * @buffer_length:
- *		    Length of buffer in bytes.
- * @urb:	    URB returned when the callback is called.
+ * @urb:	    URB.
  *
  * Returns: A submitted transaction handle or negative on
  *	    failure. Negative values are error codes.
  */
 static int cvmx_usb_submit_bulk(struct cvmx_usb_state *usb, int pipe_handle,
-				uint64_t buffer, int buffer_length,
 				struct urb *urb)
 {
 	int submit_handle;
 
-	/* Pipe handle checking is done later in a common place */
-	if (unlikely(!buffer))
-		return -EINVAL;
-	if (unlikely(buffer_length < 0))
-		return -EINVAL;
-
 	submit_handle = __cvmx_usb_submit_transaction(usb, pipe_handle,
 						      CVMX_USB_TRANSFER_BULK,
-						      buffer,
-						      buffer_length,
+						      urb->transfer_dma,
+						      urb->transfer_buffer_length,
 						      0, /* control_header */
 						      0, /* iso_start_frame */
 						      0, /* iso_number_packets */
@@ -3494,9 +3480,7 @@ static int octeon_usb_urb_enqueue(struct usb_hcd *hcd,
 		dev_dbg(dev, "Submit bulk to %d.%d\n",
 			usb_pipedevice(urb->pipe), usb_pipeendpoint(urb->pipe));
 		submit_handle = cvmx_usb_submit_bulk(&priv->usb, pipe_handle,
-					 urb->transfer_dma,
-					 urb->transfer_buffer_length,
-					 urb);
+						     urb);
 		break;
 	}
 	if (submit_handle < 0) {