Changes in uspace/drv/block/ahci/ahci.c [071a1ddb:d51838f] in mainline

File:

• uspace/drv/block/ahci/ahci.c (modified) (2 diffs)

uspace/drv/block/ahci/ahci.c

@@ -890 +890 @@
 /** AHCI interrupt handler.
  *
+ * @param iid   The IPC call id.
  * @param icall The IPC call structure.
  * @param dev   DDF device structure.
  *
  */
-static void ahci_interrupt(ipc_call_t *icall, ddf_dev_t *dev)
+static void ahci_interrupt(ipc_callid_t iid, ipc_call_t *icall, ddf_dev_t *dev)
 {
         ahci_dev_t *ahci = dev_ahci_dev(dev);
@@ -1184 +1185 @@
         ct.ranges = ahci_ranges;
         
-        int irq_cap;
-        int rc = register_interrupt_handler(dev,
-            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
-        if (rc != EOK) {
+        int irq_cap = register_interrupt_handler(dev,
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct);
+        if (irq_cap < 0) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");
                 goto error_register_interrupt_handler;
         }
         
-        rc = hw_res_enable_interrupt(ahci->parent_sess,
+        int rc = hw_res_enable_interrupt(ahci->parent_sess,
             hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {