Changes in kernel/generic/src/ipc/irq.c [455241b:111b9b9] in mainline

File:

• kernel/generic/src/ipc/irq.c (modified) (4 diffs)

kernel/generic/src/ipc/irq.c

@@ -295 +295 @@
 }
 
-static void irq_destroy(kobject_t *arg)
-{
-        irq_kobject_t *kobj = (irq_kobject_t *) arg;
-
-        irq_hash_out(&kobj->irq);
+static void irq_destroy(void *arg)
+{
+        irq_t *irq = (irq_t *) arg;
+
+        irq_hash_out(irq);
 
         /* Free up the IRQ code and associated structures. */
-        code_free(kobj->irq.notif_cfg.code);
-        slab_free(irq_cache, kobj);
+        code_free(irq->notif_cfg.code);
+        slab_free(irq_cache, irq);
 }
 
@@ -350 +350 @@
         }
 
-        irq_kobject_t *kobj = slab_alloc(irq_cache, FRAME_ATOMIC);
-        if (!kobj) {
+        irq_t *irq = (irq_t *) slab_alloc(irq_cache, FRAME_ATOMIC);
+        if (!irq) {
                 cap_free(TASK, handle);
                 return ENOMEM;
         }
 
-        kobject_initialize(&kobj->kobject, KOBJECT_TYPE_IRQ);
-
-        irq_t *irq = &kobj->irq;
+        kobject_t *kobject = kobject_alloc(FRAME_ATOMIC);
+        if (!kobject) {
+                cap_free(TASK, handle);
+                slab_free(irq_cache, irq);
+                return ENOMEM;
+        }
 
         irq_initialize(irq);
@@ -382 +385 @@
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
 
-        cap_publish(TASK, handle, &kobj->kobject);
+        kobject_initialize(kobject, KOBJECT_TYPE_IRQ, irq);
+        cap_publish(TASK, handle, kobject);
 
         return EOK;
@@ -401 +405 @@
                 return ENOENT;
 
-        assert(irq_from_kobject(kobj)->notif_cfg.answerbox == box);
-
-        irq_hash_out(irq_from_kobject(kobj));
+        assert(kobj->irq->notif_cfg.answerbox == box);
+
+        irq_hash_out(kobj->irq);
 
         kobject_put(kobj);