Skip to content

Commit 9012f84

Browse files
Jinjie RuanKAGA-KOKO
authored andcommitted
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent c7718e5 commit 9012f84

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

kernel/irq/proc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ static int show_irq_affinity(int type, struct seq_file *m)
5252
case AFFINITY:
5353
case AFFINITY_LIST:
5454
mask = desc->irq_common_data.affinity;
55-
#ifdef CONFIG_GENERIC_PENDING_IRQ
56-
if (irqd_is_setaffinity_pending(&desc->irq_data))
57-
mask = desc->pending_mask;
58-
#endif
55+
if (irq_move_pending(&desc->irq_data))
56+
mask = irq_desc_get_pending_mask(desc);
5957
break;
6058
case EFFECTIVE:
6159
case EFFECTIVE_LIST:

0 commit comments

Comments
 (0)