Skip to content

Commit

Permalink
x86: DT: Cleanup namespace and call irq_set_irq_type() unconditional
Browse files Browse the repository at this point in the history
That call escaped the name space cleanup. Fix it up.

We really want to call there. The chip might have changed since the
irq was setup initially. So let the core code and the chip decide what
to do. The status is just an unreliable snapshot.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Mar 24, 2011
1 parent 00a30b2 commit 07611db
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/x86/kernel/devicetree.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
return 0;
if (type == IRQ_TYPE_NONE)
return virq;
/* set the mask if it is different from current */
if (type == (irq_to_desc(virq)->status & IRQF_TRIGGER_MASK))
set_irq_type(virq, type);
irq_set_irq_type(virq, type);
return virq;
}
EXPORT_SYMBOL_GPL(irq_create_of_mapping);
Expand Down

0 comments on commit 07611db

Please sign in to comment.