|
@@ -56,9 +56,10 @@ rawhide_update_irq_hw(int hose, int mask)
|
|
|
(((h) < MCPCIA_MAX_HOSES) && (cached_irq_masks[(h)] != 0))
|
|
|
|
|
|
static inline void
|
|
|
-rawhide_enable_irq(unsigned int irq)
|
|
|
+rawhide_enable_irq(struct irq_data *d)
|
|
|
{
|
|
|
unsigned int mask, hose;
|
|
|
+ unsigned int irq = d->irq;
|
|
|
|
|
|
irq -= 16;
|
|
|
hose = irq / 24;
|
|
@@ -76,9 +77,10 @@ rawhide_enable_irq(unsigned int irq)
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
-rawhide_disable_irq(unsigned int irq)
|
|
|
+rawhide_disable_irq(struct irq_data *d)
|
|
|
{
|
|
|
unsigned int mask, hose;
|
|
|
+ unsigned int irq = d->irq;
|
|
|
|
|
|
irq -= 16;
|
|
|
hose = irq / 24;
|
|
@@ -96,9 +98,10 @@ rawhide_disable_irq(unsigned int irq)
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
-rawhide_mask_and_ack_irq(unsigned int irq)
|
|
|
+rawhide_mask_and_ack_irq(struct irq_data *d)
|
|
|
{
|
|
|
unsigned int mask, mask1, hose;
|
|
|
+ unsigned int irq = d->irq;
|
|
|
|
|
|
irq -= 16;
|
|
|
hose = irq / 24;
|
|
@@ -123,9 +126,9 @@ rawhide_mask_and_ack_irq(unsigned int irq)
|
|
|
|
|
|
static struct irq_chip rawhide_irq_type = {
|
|
|
.name = "RAWHIDE",
|
|
|
- .unmask = rawhide_enable_irq,
|
|
|
- .mask = rawhide_disable_irq,
|
|
|
- .mask_ack = rawhide_mask_and_ack_irq,
|
|
|
+ .irq_unmask = rawhide_enable_irq,
|
|
|
+ .irq_mask = rawhide_disable_irq,
|
|
|
+ .irq_mask_ack = rawhide_mask_and_ack_irq,
|
|
|
};
|
|
|
|
|
|
static void
|
|
@@ -177,8 +180,8 @@ rawhide_init_irq(void)
|
|
|
}
|
|
|
|
|
|
for (i = 16; i < 128; ++i) {
|
|
|
- irq_to_desc(i)->status |= IRQ_LEVEL;
|
|
|
set_irq_chip_and_handler(i, &rawhide_irq_type, handle_level_irq);
|
|
|
+ irq_set_status_flags(i, IRQ_LEVEL);
|
|
|
}
|
|
|
|
|
|
init_i8259a_irqs();
|