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

File:

• uspace/drv/audio/sb16/main.c (modified) (7 diffs)

uspace/drv/audio/sb16/main.c

@@ -47 +47 @@
 #define NAME "sb16"
 
-static errno_t sb_add_device(ddf_dev_t *device);
-static errno_t sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
+static int sb_add_device(ddf_dev_t *device);
+static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
     addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16);
-static errno_t sb_enable_interrupt(ddf_dev_t *device, int irq);
+static int sb_enable_interrupt(ddf_dev_t *device, int irq);
 
 static driver_ops_t sb_driver_ops = {
@@ -87 +87 @@
  * @return Error code.
  */
-static errno_t sb_add_device(ddf_dev_t *device)
+static int sb_add_device(ddf_dev_t *device)
 {
         bool handler_regd = false;
@@ -96 +96 @@
 
         sb16_t *soft_state = ddf_dev_data_alloc(device, sizeof(sb16_t));
-        errno_t rc = soft_state ? EOK : ENOMEM;
+        int rc = soft_state ? EOK : ENOMEM;
         if (rc != EOK) {
                 ddf_log_error("Failed to allocate sb16 structure.");
@@ -123 +123 @@
         };
 
-        rc = register_interrupt_handler(device, irq, irq_handler,
-            &irq_code, &irq_cap);
-        if (rc != EOK) {
+        irq_cap = register_interrupt_handler(device, irq, irq_handler,
+            &irq_code);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 ddf_log_error("Failed to register irq handler: %s.",
                     str_error(rc));
@@ -173 +174 @@
 }
 
-static errno_t sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
+static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
     addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16)
 {
@@ -184 +185 @@
         hw_res_list_parsed_t hw_res;
         hw_res_list_parsed_init(&hw_res);
-        const errno_t ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
         if (ret != EOK) {
                 return ret;
@@ -241 +242 @@
 }
 
-static errno_t sb_enable_interrupt(ddf_dev_t *device, int irq)
+static int sb_enable_interrupt(ddf_dev_t *device, int irq)
 {
         async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);