|
@@ -18,27 +18,27 @@
|
|
|
DEFINE_SPINLOCK(srm_irq_lock);
|
|
|
|
|
|
static inline void
|
|
|
-srm_enable_irq(unsigned int irq)
|
|
|
+srm_enable_irq(struct irq_data *d)
|
|
|
{
|
|
|
spin_lock(&srm_irq_lock);
|
|
|
- cserve_ena(irq - 16);
|
|
|
+ cserve_ena(d->irq - 16);
|
|
|
spin_unlock(&srm_irq_lock);
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
-srm_disable_irq(unsigned int irq)
|
|
|
+srm_disable_irq(struct irq_data *d)
|
|
|
{
|
|
|
spin_lock(&srm_irq_lock);
|
|
|
- cserve_dis(irq - 16);
|
|
|
+ cserve_dis(d->irq - 16);
|
|
|
spin_unlock(&srm_irq_lock);
|
|
|
}
|
|
|
|
|
|
/* Handle interrupts from the SRM, assuming no additional weirdness. */
|
|
|
static struct irq_chip srm_irq_type = {
|
|
|
.name = "SRM",
|
|
|
- .unmask = srm_enable_irq,
|
|
|
- .mask = srm_disable_irq,
|
|
|
- .mask_ack = srm_disable_irq,
|
|
|
+ .irq_unmask = srm_enable_irq,
|
|
|
+ .irq_mask = srm_disable_irq,
|
|
|
+ .irq_mask_ack = srm_disable_irq,
|
|
|
};
|
|
|
|
|
|
void __init
|
|
@@ -52,7 +52,7 @@ init_srm_irqs(long max, unsigned long ignore_mask)
|
|
|
if (i < 64 && ((ignore_mask >> i) & 1))
|
|
|
continue;
|
|
|
set_irq_chip_and_handler(i, &srm_irq_type, handle_level_irq);
|
|
|
- irq_to_desc(i)->status |= IRQ_LEVEL;
|
|
|
+ irq_set_status_flags(i, IRQ_LEVEL);
|
|
|
}
|
|
|
}
|
|
|
|