Index: uspace/drv/bus/usb/ohci/ohci_batch.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_batch.c	(revision 7bce1fc3e846c46d5a050f12e56dd9383ae5addc)
+++ uspace/drv/bus/usb/ohci/ohci_batch.c	(revision 5f579297a7da64131342031128de0ca75b943366)
@@ -147,5 +147,5 @@
 /** Check batch TDs' status.
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] ohci_batch Batch structure to use.
  * @return False, if there is an active TD, true otherwise.
  *
@@ -213,5 +213,5 @@
 /** Starts execution of the TD list
  *
- * @param[in] instance Batch structure to use
+ * @param[in] ohci_batch Batch structure to use
  */
 void ohci_transfer_batch_commit(ohci_transfer_batch_t *ohci_batch)
@@ -223,5 +223,5 @@
 /** Prepare generic control transfer
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] ohci_batch Batch structure to use.
  * @param[in] data_dir Direction to use for data stage.
  * @param[in] status_dir Direction to use for status stage.
@@ -289,11 +289,7 @@
 }
 /*----------------------------------------------------------------------------*/
-#define LOG_BATCH_INITIALIZED(batch, name, dir) \
-	usb_log_debug2("Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
-	    (batch), (name), (dir), USB_TRANSFER_BATCH_ARGS(*(batch)))
-
 /** Prepare generic data transfer
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] ohci_batch Batch structure to use.
  *
  * Direction is supplied by the associated ep and toggle is maintained by the
@@ -330,7 +326,10 @@
 		++td_current;
 	}
-	LOG_BATCH_INITIALIZED(ohci_batch->usb_batch,
+	usb_log_debug2(
+	    "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+	    ohci_batch->usb_batch,
 	    usb_str_transfer_type(ohci_batch->usb_batch->ep->transfer_type),
-	    usb_str_direction(ohci_batch->usb_batch->ep->direction));
+	    usb_str_direction(ohci_batch->usb_batch->ep->direction),
+	    USB_TRANSFER_BATCH_ARGS(*ohci_batch->usb_batch));
 }
 /*----------------------------------------------------------------------------*/
@@ -338,11 +337,19 @@
 {
         // TODO Find a better way to do this
+	/* Check first bit of the first setup request byte
+	 * (it signals hc-> dev or dev->hc communication) */
+	const char *direction;
         if (ohci_batch->device_buffer[0] & (1 << 7)) {
 		batch_control(ohci_batch, USB_DIRECTION_IN, USB_DIRECTION_OUT);
-		LOG_BATCH_INITIALIZED(ohci_batch->usb_batch, "control", "write");
+		direction = "read";
         } else {
 		batch_control(ohci_batch, USB_DIRECTION_OUT, USB_DIRECTION_IN);
-		LOG_BATCH_INITIALIZED(ohci_batch->usb_batch, "control", "write");
-	}
+		direction = "write";
+	}
+	usb_log_debug2(
+	    "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+	    ohci_batch->usb_batch,
+	    usb_str_transfer_type(ohci_batch->usb_batch->ep->transfer_type),
+	    direction, USB_TRANSFER_BATCH_ARGS(*ohci_batch->usb_batch));
 }
 /*----------------------------------------------------------------------------*/
Index: uspace/drv/bus/usb/uhci/uhci_batch.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_batch.c	(revision 7bce1fc3e846c46d5a050f12e56dd9383ae5addc)
+++ uspace/drv/bus/usb/uhci/uhci_batch.c	(revision 5f579297a7da64131342031128de0ca75b943366)
@@ -152,5 +152,5 @@
 /** Check batch TDs for activity.
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] uhci_batch Batch structure to use.
  * @return False, if there is an active TD, true otherwise.
  *
@@ -202,13 +202,8 @@
 	return true;
 }
-
-#define LOG_BATCH_INITIALIZED(batch, name, dir) \
-	usb_log_debug2("Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
-	    (batch), (name), (dir), USB_TRANSFER_BATCH_ARGS(*(batch)))
-
 /*----------------------------------------------------------------------------*/
 /** Prepare generic data transfer
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] uhci_batch Batch structure to use.
  * @param[in] pid Pid to use for data transactions.
  *
@@ -261,12 +256,15 @@
 	td_set_ioc(&uhci_batch->tds[td - 1]);
 	endpoint_toggle_set(uhci_batch->usb_batch->ep, toggle);
-	LOG_BATCH_INITIALIZED(uhci_batch->usb_batch,
+	usb_log_debug2(
+	    "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+	    uhci_batch->usb_batch,
 	    usb_str_transfer_type(uhci_batch->usb_batch->ep->transfer_type),
-	    usb_str_direction(uhci_batch->usb_batch->ep->direction));
+	    usb_str_direction(uhci_batch->usb_batch->ep->direction),
+	    USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch));
 }
 /*----------------------------------------------------------------------------*/
 /** Prepare generic control transfer
  *
- * @param[in] instance Batch structure to use.
+ * @param[in] uhci_batch Batch structure to use.
  * @param[in] data_stage Pid to use for data tds.
  * @param[in] status_stage Pid to use for data tds.
@@ -341,11 +339,17 @@
 	/* Check first bit of the first setup request byte
 	 * (it signals hc-> dev or dev->hc communication) */
+	const char *direction = NULL;
 	if (uhci_batch->usb_batch->setup_buffer[0] & (1 << 7)) {
 		batch_control(uhci_batch, USB_PID_IN, USB_PID_OUT);
-		LOG_BATCH_INITIALIZED(uhci_batch->usb_batch, "control", "read");
+		direction = "read";
 	} else {
 		batch_control(uhci_batch, USB_PID_OUT, USB_PID_IN);
-		LOG_BATCH_INITIALIZED(uhci_batch->usb_batch, "control", "write");
-	}
+		direction = "write";
+	}
+	usb_log_debug2(
+	    "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+	    uhci_batch->usb_batch,
+	    usb_str_transfer_type(uhci_batch->usb_batch->ep->transfer_type),
+	    direction, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch));
 }
 /*----------------------------------------------------------------------------*/