Index: uspace/drv/bus/usb/uhci/uhci_rh.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 7a1757eaf152a2386b911587b484b145acdaf4b0)
+++ uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 9e9d018ef6ffcd0f04a413a1bd2062d929fa55e7)
@@ -168,9 +168,9 @@
 } while (0)
 
-#define RH_DEBUG(d, port, msg, ...) \
+#define RH_DEBUG(hub, port, msg, ...) \
 	if ((int)port >= 0) \
-		usb_log_debug("%s: rh-%d: " msg, d->name, port, ##__VA_ARGS__); \
+		usb_log_debug("RH(%p-%d): " msg, hub, port, ##__VA_ARGS__); \
 	else \
-		usb_log_debug("%s: rh: " msg, d->name, ##__VA_ARGS__) \
+		usb_log_debug("RH(%p):" msg, hub, ##__VA_ARGS__) \
 
 /** USB HUB port state request handler.
@@ -198,5 +198,5 @@
 	data[0] = ((value & STATUS_LINE_D_MINUS) ? 1 : 0)
 	    | ((value & STATUS_LINE_D_PLUS) ? 2 : 0);
-	RH_DEBUG(device, port, "Bus state %" PRIx8 "(source %" PRIx16")\n",
+	RH_DEBUG(hub, port, "Bus state %" PRIx8 "(source %" PRIx16")\n",
 	    data[0], value);
 	*act_size = 1;
@@ -243,5 +243,5 @@
 	    ((hub->reset_changed[port] ? 1 : 0) << USB_HUB_FEATURE_C_PORT_RESET)
 	);
-	RH_DEBUG(device, port, "Port status %" PRIx32 " (source %" PRIx16
+	RH_DEBUG(hub, port, "Port status %" PRIx32 " (source %" PRIx16
 	    "%s)\n", uint32_usb2host(status), val,
 	    hub->reset_changed[port] ? "-reset" : "");
@@ -271,10 +271,10 @@
 	switch (feature) {
 	case USB_HUB_FEATURE_PORT_ENABLE:
-		RH_DEBUG(device, port, "Clear port enable (status %"
+		RH_DEBUG(hub, port, "Clear port enable (status %"
 		    PRIx16 ")\n", status);
 		pio_write_16(hub->ports[port], val & ~STATUS_ENABLED);
 		break;
 	case USB_HUB_FEATURE_PORT_SUSPEND:
-		RH_DEBUG(device, port, "Clear port suspend (status %"
+		RH_DEBUG(hub, port, "Clear port suspend (status %"
 		    PRIx16 ")\n", status);
 		pio_write_16(hub->ports[port], val & ~STATUS_SUSPEND);
@@ -283,5 +283,5 @@
 		break;
 	case USB_HUB_FEATURE_PORT_POWER:
-		RH_DEBUG(device, port, "Clear port power (status %" PRIx16 ")\n",
+		RH_DEBUG(hub, port, "Clear port power (status %" PRIx16 ")\n",
 		    status);
 		/* We are always powered */
@@ -289,31 +289,31 @@
 		break;
 	case USB_HUB_FEATURE_C_PORT_CONNECTION:
-		RH_DEBUG(device, port, "Clear port conn change (status %"
+		RH_DEBUG(hub, port, "Clear port conn change (status %"
 		    PRIx16 ")\n", status);
 		pio_write_16(hub->ports[port], val | STATUS_CONNECTED_CHANGED);
 		break;
 	case USB_HUB_FEATURE_C_PORT_RESET:
-		RH_DEBUG(device, port, "Clear port reset change (status %"
+		RH_DEBUG(hub, port, "Clear port reset change (status %"
 		    PRIx16 ")\n", status);
 		hub->reset_changed[port] = false;
 		break;
 	case USB_HUB_FEATURE_C_PORT_ENABLE:
-		RH_DEBUG(device, port, "Clear port enable change (status %"
+		RH_DEBUG(hub, port, "Clear port enable change (status %"
 		    PRIx16 ")\n", status);
 		pio_write_16(hub->ports[port], status | STATUS_ENABLED_CHANGED);
 		break;
 	case USB_HUB_FEATURE_C_PORT_SUSPEND:
-		RH_DEBUG(device, port, "Clear port suspend change (status %"
+		RH_DEBUG(hub, port, "Clear port suspend change (status %"
 		    PRIx16 ")\n", status);
 		//TODO
 		return ENOTSUP;
 	case USB_HUB_FEATURE_C_PORT_OVER_CURRENT:
-		RH_DEBUG(device, port, "Clear port OC change (status %"
+		RH_DEBUG(hub, port, "Clear port OC change (status %"
 		    PRIx16 ")\n", status);
 		/* UHCI Does not report over current */
-		//TODO: newer chips do, but some have broken wiring 
+		//TODO: newer chips do, but some have broken wiring
 		break;
 	default:
-		RH_DEBUG(device, port, "Clear unknown feature %d (status %"
+		RH_DEBUG(hub, port, "Clear unknown feature %d (status %"
 		    PRIx16 ")\n", feature, status);
 		usb_log_warning("Clearing feature %d is unsupported\n",
@@ -343,13 +343,13 @@
 	switch (feature) {
 	case USB_HUB_FEATURE_PORT_RESET:
-		RH_DEBUG(device, port, "Set port reset before (status %" PRIx16
+		RH_DEBUG(hub, port, "Set port reset before (status %" PRIx16
 		    ")\n", status);
 		uhci_port_reset_enable(hub->ports[port]);
 		hub->reset_changed[port] = true;
-		RH_DEBUG(device, port, "Set port reset after (status %" PRIx16
+		RH_DEBUG(hub, port, "Set port reset after (status %" PRIx16
 		    ")\n", pio_read_16(hub->ports[port]));
 		break;
 	case USB_HUB_FEATURE_PORT_SUSPEND:
-		RH_DEBUG(device, port, "Set port suspend (status %" PRIx16
+		RH_DEBUG(hub, port, "Set port suspend (status %" PRIx16
 		    ")\n", status);
 		pio_write_16(hub->ports[port],
@@ -358,5 +358,5 @@
 		break;
 	case USB_HUB_FEATURE_PORT_POWER:
-		RH_DEBUG(device, port, "Set port power (status %" PRIx16
+		RH_DEBUG(hub, port, "Set port power (status %" PRIx16
 		    ")\n", status);
 		/* We are always powered */
@@ -367,5 +367,5 @@
 	case USB_HUB_FEATURE_C_PORT_SUSPEND:
 	case USB_HUB_FEATURE_C_PORT_OVER_CURRENT:
-		RH_DEBUG(device, port, "Set port change flag (status %" PRIx16
+		RH_DEBUG(hub, port, "Set port change flag (status %" PRIx16
 		    ")\n", status);
 		/* These are voluntary and don't have to be set
@@ -373,5 +373,5 @@
 		break;
 	default:
-		RH_DEBUG(device, port, "Set unknown feature %d (status %" PRIx16
+		RH_DEBUG(hub, port, "Set unknown feature %d (status %" PRIx16
 		    ")\n", feature, status);
 		usb_log_warning("Setting feature %d is unsupported\n",
@@ -412,5 +412,5 @@
 	        0x4 : 0);
 
-	RH_DEBUG(device, -1, "Event mask %" PRIx8
+	RH_DEBUG(hub, -1, "Event mask %" PRIx8
 	    " (status_a %" PRIx16 "%s),"
 	    " (status_b %" PRIx16 "%s)\n", status,