Index: uspace/drv/bus/usb/usbhub/port_status.h
===================================================================
--- uspace/drv/bus/usb/usbhub/port_status.h	(revision 8d3cd30b3d4967ca27a72136f615945a8e54a245)
+++ uspace/drv/bus/usb/usbhub/port_status.h	(revision b3433a25a941b012b6e8e37fa2c00a8e4e2ea6ee)
@@ -69,33 +69,4 @@
 
 /**
- * set values in request to be it a port status request
- * @param request
- * @param port
- */
-static inline void usb_hub_set_port_status_request(
-    usb_device_request_setup_packet_t *request, uint16_t port)
-{
-	request->index = port;
-	request->request_type = USB_HUB_REQ_TYPE_GET_PORT_STATUS;
-	request->request = USB_HUB_REQUEST_GET_STATUS;
-	request->value = 0;
-	request->length = 4;
-}
-
-/**
- * create request for usb hub port status
- * @param port
- * @return
- */
-static inline usb_device_request_setup_packet_t *
-    usb_hub_create_port_status_request(uint16_t port)
-{
-	usb_device_request_setup_packet_t *result =
-	    malloc(sizeof(usb_device_request_setup_packet_t));
-	usb_hub_set_port_status_request(result, port);
-	return result;
-}
-
-/**
  * set the device request to be a port feature enable request
  * @param request
Index: uspace/drv/bus/usb/usbhub/ports.c
===================================================================
--- uspace/drv/bus/usb/usbhub/ports.c	(revision 8d3cd30b3d4967ca27a72136f615945a8e54a245)
+++ uspace/drv/bus/usb/usbhub/ports.c	(revision b3433a25a941b012b6e8e37fa2c00a8e4e2ea6ee)
@@ -98,11 +98,8 @@
 {
 	usb_log_debug("Interrupt at port %zu\n", (size_t) port);
-	//determine type of change
-	//usb_pipe_t *pipe = hub->control_pipe;
-
-	int opResult;
 
 	usb_port_status_t status;
-	opResult = get_port_status(&hub->usb_device->ctrl_pipe, port, &status);
+	const int opResult =
+	    get_port_status(&hub->usb_device->ctrl_pipe, port, &status);
 	if (opResult != EOK) {
 		usb_log_error("Failed to get port %zu status: %s.\n",
@@ -119,5 +116,5 @@
 
 		if (device_connected) {
-			opResult = create_add_device_fibril(hub, port,
+			const int opResult = create_add_device_fibril(hub, port,
 			    usb_port_speed(status));
 			if (opResult != EOK) {
@@ -300,13 +297,20 @@
  */
 static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port,
-    usb_port_status_t *status) {
+    usb_port_status_t *status)
+{
 	size_t recv_size;
-	usb_device_request_setup_packet_t request;
 	usb_port_status_t status_tmp;
-
-	usb_hub_set_port_status_request(&request, port);
-	int rc = usb_pipe_control_read(ctrl_pipe,
-	    &request, sizeof (usb_device_request_setup_packet_t),
-	    &status_tmp, sizeof (status_tmp), &recv_size);
+	/* USB hub specific GET_PORT_STATUS request. See USB Spec 11.16.2.6 */
+	const usb_device_request_setup_packet_t request = {
+		.request_type = USB_HUB_REQ_TYPE_GET_PORT_STATUS,
+		.request = USB_HUB_REQUEST_GET_STATUS,
+		.value = 0,
+		.index = port,
+		.length = sizeof(usb_port_status_t),
+	};
+
+	const int rc = usb_pipe_control_read(ctrl_pipe,
+	    &request, sizeof(usb_device_request_setup_packet_t),
+	    &status_tmp, sizeof(status_tmp), &recv_size);
 	if (rc != EOK) {
 		return rc;
Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision 8d3cd30b3d4967ca27a72136f615945a8e54a245)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision b3433a25a941b012b6e8e37fa2c00a8e4e2ea6ee)
@@ -234,5 +234,5 @@
  * @return error code
  */
-int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info)
+static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info)
 {
 	assert(hub_info);
Index: uspace/drv/bus/usb/usbhub/utils.h
===================================================================
--- uspace/drv/bus/usb/usbhub/utils.h	(revision 8d3cd30b3d4967ca27a72136f615945a8e54a245)
+++ uspace/drv/bus/usb/usbhub/utils.h	(revision b3433a25a941b012b6e8e37fa2c00a8e4e2ea6ee)
@@ -55,7 +55,4 @@
 //
 //************
-
-
-usb_hub_info_t * usb_create_hub_info(ddf_dev_t * device);
 
 /**