Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision bdb23c63484a8337e470365c6ac49d5c0e525ee2)
+++ uspace/lib/usbdev/src/pipes.c	(revision 22ecbde9e8df22c7cad4263622c73f87d711ae3f)
@@ -40,7 +40,6 @@
 /** Prepare pipe for a long transfer.
  *
- * By a long transfer is mean transfer consisting of several
- * requests to the HC.
- * Calling such function is optional and it has positive effect of
+ * Long transfer is transfer consisting of several requests to the HC.
+ * Calling this function is optional and it has positive effect of
  * improved performance because IPC session is initiated only once.
  *
@@ -57,8 +56,7 @@
 /*----------------------------------------------------------------------------*/
 /** Terminate a long transfer on a pipe.
- *
+ * @param pipe Pipe where to end the long transfer.
+ * @return Error code.
  * @see usb_pipe_start_long_transfer
- *
- * @param pipe Pipe where to end the long transfer.
  */
 int usb_pipe_end_long_transfer(usb_pipe_t *pipe)
@@ -70,45 +68,4 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Request an in transfer, no checking of input parameters.
- *
- * @param[in] pipe Pipe used for the transfer.
- * @param[out] buffer Buffer where to store the data.
- * @param[in] size Size of the buffer (in bytes).
- * @param[out] size_transfered Number of bytes that were actually transfered.
- * @return Error code.
- */
-static int usb_pipe_read_no_check(usb_pipe_t *pipe, uint64_t setup,
-    void *buffer, size_t size, size_t *size_transfered)
-{
-	/* Isochronous transfer are not supported (yet) */
-	if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
-	    pipe->transfer_type != USB_TRANSFER_BULK &&
-	    pipe->transfer_type != USB_TRANSFER_CONTROL)
-	    return ENOTSUP;
-
-	return usb_device_control_read(pipe->wire,
-	    pipe->endpoint_no, setup, buffer, size, size_transfered);
-}
-/*----------------------------------------------------------------------------*/
-/** Request an out transfer, no checking of input parameters.
- *
- * @param[in] pipe Pipe used for the transfer.
- * @param[in] buffer Buffer with data to transfer.
- * @param[in] size Size of the buffer (in bytes).
- * @return Error code.
- */
-static int usb_pipe_write_no_check(usb_pipe_t *pipe, uint64_t setup,
-    const void *buffer, size_t size)
-{
-	/* Only interrupt and bulk transfers are supported */
-	if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
-	    pipe->transfer_type != USB_TRANSFER_BULK &&
-	    pipe->transfer_type != USB_TRANSFER_CONTROL)
-	    return ENOTSUP;
-
-	return usb_device_control_write(pipe->wire,
-	    pipe->endpoint_no, setup, buffer, size);
-}
-/*----------------------------------------------------------------------------*/
 /** Try to clear endpoint halt of default control pipe.
  *
@@ -122,5 +79,4 @@
 		return;
 	}
-
 
 	/* Prevent infinite recursion. */
@@ -145,5 +101,5 @@
 int usb_pipe_control_read(usb_pipe_t *pipe,
     const void *setup_buffer, size_t setup_buffer_size,
-    void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
+    void *buffer, size_t buffer_size, size_t *transfered_size)
 {
 	assert(pipe);
@@ -153,5 +109,5 @@
 	}
 
-	if ((data_buffer == NULL) || (data_buffer_size == 0)) {
+	if ((buffer == NULL) || (buffer_size == 0)) {
 		return EINVAL;
 	}
@@ -162,10 +118,16 @@
 	}
 
+	/* Isochronous transfer are not supported (yet) */
+	if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+	    pipe->transfer_type != USB_TRANSFER_BULK &&
+	    pipe->transfer_type != USB_TRANSFER_CONTROL)
+	    return ENOTSUP;
+
 	uint64_t setup_packet;
 	memcpy(&setup_packet, setup_buffer, 8);
 
 	size_t act_size = 0;
-	const int rc = usb_pipe_read_no_check(pipe, setup_packet,
-	    data_buffer, data_buffer_size, &act_size);
+	const int rc = usb_device_control_read(pipe->wire,
+	    pipe->endpoint_no, setup_packet, buffer, buffer_size, &act_size);
 
 	if (rc == ESTALL) {
@@ -173,6 +135,6 @@
 	}
 
-	if (rc == EOK && data_transfered_size != NULL) {
-		*data_transfered_size = act_size;
+	if (rc == EOK && transfered_size != NULL) {
+		*transfered_size = act_size;
 	}
 
@@ -193,5 +155,5 @@
 int usb_pipe_control_write(usb_pipe_t *pipe,
     const void *setup_buffer, size_t setup_buffer_size,
-    const void *data_buffer, size_t data_buffer_size)
+    const void *buffer, size_t buffer_size)
 {
 	assert(pipe);
@@ -201,9 +163,9 @@
 	}
 
-	if ((data_buffer == NULL) && (data_buffer_size > 0)) {
-		return EINVAL;
-	}
-
-	if ((data_buffer != NULL) && (data_buffer_size == 0)) {
+	if ((buffer == NULL) && (buffer_size > 0)) {
+		return EINVAL;
+	}
+
+	if ((buffer != NULL) && (buffer_size == 0)) {
 		return EINVAL;
 	}
@@ -214,9 +176,15 @@
 	}
 
+	/* Isochronous transfer are not supported (yet) */
+	if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+	    pipe->transfer_type != USB_TRANSFER_BULK &&
+	    pipe->transfer_type != USB_TRANSFER_CONTROL)
+	    return ENOTSUP;
+
 	uint64_t setup_packet;
 	memcpy(&setup_packet, setup_buffer, 8);
 
-	const int rc = usb_pipe_write_no_check(pipe, setup_packet,
-	    data_buffer, data_buffer_size);
+	const int rc = usb_device_control_write(pipe->wire,
+	    pipe->endpoint_no, setup_packet, buffer, buffer_size);
 
 	if (rc == ESTALL) {
@@ -256,7 +224,13 @@
 	}
 
+	/* Isochronous transfer are not supported (yet) */
+	if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+	    pipe->transfer_type != USB_TRANSFER_BULK &&
+	    pipe->transfer_type != USB_TRANSFER_CONTROL)
+	    return ENOTSUP;
+
 	size_t act_size = 0;
-	const int rc = usb_pipe_read_no_check(pipe, 0, buffer, size, &act_size);
-
+	const int rc = usb_device_read(pipe->wire,
+	    pipe->endpoint_no, buffer, size, &act_size);
 
 	if (rc == EOK && size_transfered != NULL) {
@@ -290,5 +264,12 @@
 	}
 
-	return usb_pipe_write_no_check(pipe, 0, buffer, size);
+	/* Isochronous transfer are not supported (yet) */
+	if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+	    pipe->transfer_type != USB_TRANSFER_BULK &&
+	    pipe->transfer_type != USB_TRANSFER_CONTROL)
+	    return ENOTSUP;
+
+	return usb_device_write(pipe->wire,
+	    pipe->endpoint_no, buffer, size);
 }
 /*----------------------------------------------------------------------------*/