Changes in uspace/drv/bus/usb/uhci/hc.c [b5111c46:d52ab7b] in mainline

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (3 diffs)

uspace/drv/bus/usb/uhci/hc.c

@@ -230 +230 @@
  *
  * @param[in] instance Memory place to initialize.
- * @param[in] HC function node
  * @param[in] regs Range of device's I/O control registers.
  * @param[in] interrupts True if hw interrupts should be used.
@@ -239 +238 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, ddf_fun_t *fun, addr_range_t *regs, bool interrupts)
+int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
 {
         assert(regs->size >= sizeof(uhci_regs_t));
@@ -267 +266 @@
         }
 
-        instance->generic = ddf_fun_data_alloc(fun, sizeof(hcd_t));
-        if (instance->generic == NULL) {
-                usb_log_error("Out of memory.\n");
-                return ENOMEM;
-        }
-
-        hcd_init(instance->generic, USB_SPEED_FULL,
+        hcd_init(&instance->generic, USB_SPEED_FULL,
             BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
 
-        instance->generic->private_data = instance;
-        instance->generic->schedule = hc_schedule;
-        instance->generic->ep_add_hook = NULL;
+        instance->generic.private_data = instance;
+        instance->generic.schedule = hc_schedule;
+        instance->generic.ep_add_hook = NULL;
 
         hc_init_hw(instance);