Changes in kernel/generic/src/ddi/irq.c [0db0df2:455241b] in mainline

File:

• kernel/generic/src/ddi/irq.c (modified) (6 diffs)

kernel/generic/src/ddi/irq.c

@@ -50 +50 @@
 #include <arch.h>
 
-slab_cache_t *irq_cache = NULL;
-
 /** Spinlock protecting the kernel IRQ hash table
  *
@@ -75 +73 @@
 static size_t irq_ht_key_hash(const void *);
 static bool irq_ht_equal(const ht_link_t *, const ht_link_t *);
-static bool irq_ht_key_equal(const void *, size_t, const ht_link_t *);
+static bool irq_ht_key_equal(const void *, const ht_link_t *);
 
 static const hash_table_ops_t irq_ht_ops = {
@@ -97 +95 @@
         last_inr = inrs - 1;
 
-        irq_cache = slab_cache_create("irq_t", sizeof(irq_t), 0, NULL, NULL,
-            FRAME_ATOMIC);
-        assert(irq_cache);
-
         hash_table_create(&irq_uspace_hash_table, chains, 0, &irq_ht_ops);
         hash_table_create(&irq_kernel_hash_table, chains, 0, &irq_ht_ops);
@@ -141 +135 @@
 {
         irq_spinlock_lock(l, false);
-
-        hash_table_foreach(h, &inr, link, irq_t, irq) {
+        ht_link_t *first = hash_table_find(h, &inr);
+        for (ht_link_t *lnk = first; lnk;
+            lnk = hash_table_find_next(h, first, lnk)) {
+                irq_t *irq = hash_table_get_inst(lnk, irq_t, link);
                 irq_spinlock_lock(&irq->lock, false);
                 if (irq->claim(irq) == IRQ_ACCEPT) {
@@ -151 +147 @@
                 irq_spinlock_unlock(&irq->lock, false);
         }
-
         irq_spinlock_unlock(l, false);
 
@@ -222 +217 @@
 
 /** Return true if the key is equal to the item's lookup key. */
-bool irq_ht_key_equal(const void *key, size_t hash, const ht_link_t *item)
+bool irq_ht_key_equal(const void *key, const ht_link_t *item)
 {
         const inr_t *inr = key;