|
@@ -479,7 +479,7 @@ static int hpet_msi_next_event(unsigned long delta,
|
|
|
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 int irq)
|
|
|
|
|
|
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;
|
|
|
|