From: Jinjie Ruan <ruanjinjie@huawei.com>
Date: Thu, 29 Aug 2024 11:15:22 +0000 (+0800)
Subject: genirq/proc: Use irq_move_pending() in show_irq_affinity()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9012f84e1c5b653c282b7a6cca81454ecf7c5a0a;p=linux.git

genirq/proc: Use irq_move_pending() in show_irq_affinity()

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
---

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 9b3b12ad5dda..d98fb9c2c667 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -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: