genirq: Use a common macro to go through the actions list

The irq code browses the list of actions differently to inspect the element
one by one. Even if it is not a problem, for the sake of consistent code,
provide a macro similar to for_each_irq_desc in order to have the same loop to
go through the actions list and use it in the code.

[ tglx: Renamed the macro ]

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: http://lkml.kernel.org/r/1452765253-31148-1-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 57bff7857e879bf2301a92723ade0a968870e637..a15b5485b446e8ff5575ba87e9a4cabb80aa7286 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -136,10 +136,9 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
 {
        irqreturn_t retval = IRQ_NONE;
        unsigned int flags = 0, irq = desc->irq_data.irq;
-       struct irqaction *action = desc->action;
+       struct irqaction *action;
 
-       /* action might have become NULL since we dropped the lock */
-       while (action) {
+       for_each_action_of_desc(desc, action) {
                irqreturn_t res;
 
                trace_irq_handler_entry(irq, action);
@@ -173,7 +172,6 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
                }
 
                retval |= res;
-               action = action->next;
        }
 
        add_interrupt_randomness(irq, flags);

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index fcab63c669059308d3cc27054742587b0627b23f..eab521fc547cdfae54b786f21b2b6daca2f9ffc9 100644 (file)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -131,6 +131,9 @@ static inline void chip_bus_sync_unlock(struct irq_desc *desc)
 #define IRQ_GET_DESC_CHECK_GLOBAL      (_IRQ_DESC_CHECK)
 #define IRQ_GET_DESC_CHECK_PERCPU      (_IRQ_DESC_CHECK | _IRQ_DESC_PERCPU)
 
+#define for_each_action_of_desc(desc, act)                     \
+       for (act = desc->act; act; act = act->next)
+
 struct irq_desc *
 __irq_get_desc_lock(unsigned int irq, unsigned long *flags, bool bus,
                    unsigned int check);

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 841187239adc8e3bb0f72fb4ab0ca6a7fec2f618..3ddd2297ee95d97c66df4bfeda5ff55d222656cf 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -144,13 +144,11 @@ int irq_can_set_affinity(unsigned int irq)
  */
 void irq_set_thread_affinity(struct irq_desc *desc)
 {
-       struct irqaction *action = desc->action;
+       struct irqaction *action;
 
-       while (action) {
+       for_each_action_of_desc(desc, action)
                if (action->thread)
                        set_bit(IRQTF_AFFINITY, &action->thread_flags);
-               action = action->next;
-       }
 }
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
@@ -994,7 +992,7 @@ void irq_wake_thread(unsigned int irq, void *dev_id)
                return;
 
        raw_spin_lock_irqsave(&desc->lock, flags);
-       for (action = desc->action; action; action = action->next) {
+       for_each_action_of_desc(desc, action) {
                if (action->dev_id == dev_id) {
                        if (action->thread)
                                __irq_wake_thread(desc, action);

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index a2c02fd5d6d0f8c1ade72ab2680287f37321aa25..4e1b94726818001d7a165162b1ec954dc74880a9 100644 (file)
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -291,7 +291,7 @@ static int name_unique(unsigned int irq, struct irqaction *new_action)
        int ret = 1;
 
        raw_spin_lock_irqsave(&desc->lock, flags);
-       for (action = desc->action ; action; action = action->next) {
+       for_each_action_of_desc(desc, action) {
                if ((action != new_action) && action->name &&
                                !strcmp(new_action->name, action->name)) {
                        ret = 0;

diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 32144175458d77d39dc65353770aa187818dfe6f..5707f97a3e6ac50954f8d407d5a4aadcaa2b96fc 100644 (file)
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -211,14 +211,12 @@ static void __report_bad_irq(struct irq_desc *desc, irqreturn_t action_ret)
         * desc->lock here. See synchronize_irq().
         */
        raw_spin_lock_irqsave(&desc->lock, flags);
-       action = desc->action;
-       while (action) {
+       for_each_action_of_desc(desc, action) {
                printk(KERN_ERR "[<%p>] %pf", action->handler, action->handler);
                if (action->thread_fn)
                        printk(KERN_CONT " threaded [<%p>] %pf",
                                        action->thread_fn, action->thread_fn);
                printk(KERN_CONT "\n");
-               action = action->next;
        }
        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }