[tip: irq/core] genirq/proc: Use irq_move_pending() in show_irq_affinity()

[tip-bot2 for Jinjie Ruan]

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     9012f84e1c5b653c282b7a6cca81454ecf7c5a0a
Gitweb:        https://git.kernel.org/tip/9012f84e1c5b653c282b7a6cca81454ecf7c5a0a
Author:        Jinjie Ruan <ruanjinjie@xxxxxxxxxx>
AuthorDate:    Thu, 29 Aug 2024 19:15:22 +08:00
Committer:     Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Thu, 29 Aug 2024 16:42:06 +02:00

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@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20240829111522.230595-1-ruanjinjie@xxxxxxxxxx

---
 kernel/irq/proc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 9b3b12a..d98fb9c 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: