]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
genirq/proc: Use irq_move_pending() in show_irq_affinity()
authorJinjie Ruan <ruanjinjie@huawei.com>
Thu, 29 Aug 2024 11:15:22 +0000 (19:15 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 29 Aug 2024 14:42:06 +0000 (16:42 +0200)
irq_move_pending() encapsulates irqd_is_setaffinity_pending() depending on
CONFIG_GENERIC_PENDING_IRQ.

Replace the open coded #ifdeffery with it.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20240829111522.230595-1-ruanjinjie@huawei.com
kernel/irq/proc.c

index 9b3b12ad5dda48c04ebb645adf0e2b2f7b1251bb..d98fb9c2c6679e03e109618ee511cd5ee34d9a59 100644 (file)
@@ -52,10 +52,8 @@ static int show_irq_affinity(int type, struct seq_file *m)
        case AFFINITY:
        case AFFINITY_LIST:
                mask = desc->irq_common_data.affinity;
-#ifdef CONFIG_GENERIC_PENDING_IRQ
-               if (irqd_is_setaffinity_pending(&desc->irq_data))
-                       mask = desc->pending_mask;
-#endif
+               if (irq_move_pending(&desc->irq_data))
+                       mask = irq_desc_get_pending_mask(desc);
                break;
        case EFFECTIVE:
        case EFFECTIVE_LIST: