Commit 91ce72e0 authored by Thomas Gleixner's avatar Thomas Gleixner

ia64: iosapic: Use new irq_move_* functions

The current functions are going away.

Also use the accessor for pending setaffinity in irq_data instead of
the open coded irq_desc access.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 459960d8
...@@ -398,7 +398,7 @@ iosapic_unmask_level_irq (struct irq_data *data) ...@@ -398,7 +398,7 @@ iosapic_unmask_level_irq (struct irq_data *data)
int do_unmask_irq = 0; int do_unmask_irq = 0;
irq_complete_move(irq); irq_complete_move(irq);
if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) { if (unlikely(irqd_is_setaffinity_pending(data))) {
do_unmask_irq = 1; do_unmask_irq = 1;
mask_irq(data); mask_irq(data);
} else } else
...@@ -408,7 +408,7 @@ iosapic_unmask_level_irq (struct irq_data *data) ...@@ -408,7 +408,7 @@ iosapic_unmask_level_irq (struct irq_data *data)
iosapic_eoi(rte->iosapic->addr, vec); iosapic_eoi(rte->iosapic->addr, vec);
if (unlikely(do_unmask_irq)) { if (unlikely(do_unmask_irq)) {
move_masked_irq(irq); irq_move_masked_irq(data);
unmask_irq(data); unmask_irq(data);
} }
} }
...@@ -449,10 +449,8 @@ iosapic_startup_edge_irq (struct irq_data *data) ...@@ -449,10 +449,8 @@ iosapic_startup_edge_irq (struct irq_data *data)
static void static void
iosapic_ack_edge_irq (struct irq_data *data) iosapic_ack_edge_irq (struct irq_data *data)
{ {
unsigned int irq = data->irq; irq_complete_move(data->irq);
irq_move_irq(data);
irq_complete_move(irq);
move_native_irq(irq);
} }
#define iosapic_enable_edge_irq unmask_irq #define iosapic_enable_edge_irq unmask_irq
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment