Changes in uspace/drv/audio/hdaudio/hdaudio.c [b7fd2a0:01c3bb4] in mainline

File:

• uspace/drv/audio/hdaudio/hdaudio.c (modified) (8 diffs)

uspace/drv/audio/hdaudio/hdaudio.c

@@ -52 +52 @@
 #define NAME "hdaudio"
 
-static errno_t hda_dev_add(ddf_dev_t *dev);
-static errno_t hda_dev_remove(ddf_dev_t *dev);
-static errno_t hda_dev_gone(ddf_dev_t *dev);
-static errno_t hda_fun_online(ddf_fun_t *fun);
-static errno_t hda_fun_offline(ddf_fun_t *fun);
+static int hda_dev_add(ddf_dev_t *dev);
+static int hda_dev_remove(ddf_dev_t *dev);
+static int hda_dev_gone(ddf_dev_t *dev);
+static int hda_fun_online(ddf_fun_t *fun);
+static int hda_fun_offline(ddf_fun_t *fun);
 
 static void hdaudio_interrupt(ipc_call_t *, ddf_dev_t *);
@@ -148 +148 @@
 };
 
-static errno_t hda_dev_add(ddf_dev_t *dev)
+static int hda_dev_add(ddf_dev_t *dev)
 {
         ddf_fun_t *fun_pcm = NULL;
@@ -160 +160 @@
         int i;
         void *regs = NULL;
-        errno_t rc;
+        int rc;
 
         ddf_msg(LVL_NOTE, "hda_dev_add()");
@@ -259 +259 @@
         rc = hw_res_enable_interrupt(hda->parent_sess, res.irqs.irqs[0]);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed enabling interrupt.: %s", str_error(rc));
-                goto error;
-        }
-
-        int irq_cap;
-        rc = register_interrupt_handler(dev, res.irqs.irqs[0],
-            hdaudio_interrupt, &irq_code, &irq_cap);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed registering interrupt handler: %s",
-                    str_error_name(rc));
+                ddf_msg(LVL_ERROR, "Failed enabling interrupt. (%d)", rc);
+                goto error;
+        }
+
+        int irq_cap = register_interrupt_handler(dev, res.irqs.irqs[0],
+            hdaudio_interrupt, &irq_code);
+        if (irq_cap < 0) {
+                rc = irq_cap;
+                ddf_msg(LVL_ERROR, "Failed registering interrupt handler. (%d)",
+                    rc);
                 goto error;
         }
@@ -314 +314 @@
         hw_res_list_parsed_clean(&res);
 
-        ddf_msg(LVL_NOTE, "Failing hda_dev_add() -> %s", str_error_name(rc));
+        ddf_msg(LVL_NOTE, "Failing hda_dev_add() -> %d", rc);
         return rc;
 }
 
-static errno_t hda_dev_remove(ddf_dev_t *dev)
+static int hda_dev_remove(ddf_dev_t *dev)
 {
         hda_t *hda = (hda_t *)ddf_dev_data_get(dev);
-        errno_t rc;
+        int rc;
 
         ddf_msg(LVL_DEBUG, "hda_dev_remove(%p)", dev);
@@ -340 +340 @@
 }
 
-static errno_t hda_dev_gone(ddf_dev_t *dev)
+static int hda_dev_gone(ddf_dev_t *dev)
 {
         hda_t *hda = (hda_t *)ddf_dev_data_get(dev);
-        errno_t rc;
+        int rc;
 
         ddf_msg(LVL_DEBUG, "hda_dev_remove(%p)", dev);
@@ -356 +356 @@
 }
 
-static errno_t hda_fun_online(ddf_fun_t *fun)
+static int hda_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "hda_fun_online()");
@@ -362 +362 @@
 }
 
-static errno_t hda_fun_offline(ddf_fun_t *fun)
+static int hda_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "hda_fun_offline()");