Changes in kernel/generic/src/ipc/irq.c [c1f68b0:82cbf8c6] in mainline

File:

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

kernel/generic/src/ipc/irq.c

@@ -271 +271 @@
 }
 
-static void irq_hash_out(irq_t *irq)
-{
-        irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
-        irq_spinlock_lock(&irq->lock, false);
-        
-        if (irq->notif_cfg.hashed_in) {
-                /* Remove the IRQ from the uspace IRQ hash table. */
-                hash_table_remove_item(&irq_uspace_hash_table, &irq->link);
-                irq->notif_cfg.hashed_in = false;
-        }
-
-        irq_spinlock_unlock(&irq->lock, false);
-        irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
-}
-
 static void irq_destroy(void *arg)
 {
         irq_t *irq = (irq_t *) arg;
-
-        irq_hash_out(irq);
 
         /* Free up the IRQ code and associated structures. */
@@ -390 +373 @@
         assert(kobj->irq->notif_cfg.answerbox == box);
 
-        irq_hash_out(kobj->irq);
+        irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
+        irq_spinlock_lock(&kobj->irq->lock, false);
+        
+        if (kobj->irq->notif_cfg.hashed_in) {
+                /* Remove the IRQ from the uspace IRQ hash table. */
+                hash_table_remove_item(&irq_uspace_hash_table,
+                    &kobj->irq->link);
+                kobj->irq->notif_cfg.hashed_in = false;
+        }
+
+        irq_spinlock_unlock(&kobj->irq->lock, false);
+        irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
 
         kobject_put(kobj);