Messages in this thread Patch in this message | | | Date | Wed, 07 May 2014 15:44:07 -0000 | From | Thomas Gleixner <> | Subject | [patch 06/32] x86: hpet: Use irq_alloc/free_hwirq() |
| |
Use the new interfaces. No functional change.
This does not replace the requirement to move x86 to irq domains, but it limits the mess to some degree.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: x86@kernel.org --- arch/x86/kernel/hpet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Index: tip/arch/x86/kernel/hpet.c =================================================================== --- tip.orig/arch/x86/kernel/hpet.c +++ tip/arch/x86/kernel/hpet.c @@ -479,7 +479,7 @@ static int hpet_msi_next_event(unsigned static int hpet_setup_msi_irq(unsigned int irq) { if (x86_msi.setup_hpet_msi(irq, hpet_blockid)) { - destroy_irq(irq); + irq_free_hwirq(irq); return -EINVAL; } return 0; @@ -487,9 +487,8 @@ static int hpet_setup_msi_irq(unsigned i static int hpet_assign_irq(struct hpet_dev *dev) { - unsigned int irq; + unsigned int irq = irq_alloc_hwirq(-1); - irq = create_irq_nr(0, -1); if (!irq) return -EINVAL;
| |