|
@@ -23,9 +23,9 @@
|
|
|
|
|
|
static DEFINE_RAW_SPINLOCK(r4030_lock);
|
|
static DEFINE_RAW_SPINLOCK(r4030_lock);
|
|
|
|
|
|
-static void enable_r4030_irq(unsigned int irq)
|
|
|
|
|
|
+static void enable_r4030_irq(struct irq_data *d)
|
|
{
|
|
{
|
|
- unsigned int mask = 1 << (irq - JAZZ_IRQ_START);
|
|
|
|
|
|
+ unsigned int mask = 1 << (d->irq - JAZZ_IRQ_START);
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
|
|
raw_spin_lock_irqsave(&r4030_lock, flags);
|
|
raw_spin_lock_irqsave(&r4030_lock, flags);
|
|
@@ -34,9 +34,9 @@ static void enable_r4030_irq(unsigned int irq)
|
|
raw_spin_unlock_irqrestore(&r4030_lock, flags);
|
|
raw_spin_unlock_irqrestore(&r4030_lock, flags);
|
|
}
|
|
}
|
|
|
|
|
|
-void disable_r4030_irq(unsigned int irq)
|
|
|
|
|
|
+void disable_r4030_irq(struct irq_data *d)
|
|
{
|
|
{
|
|
- unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START));
|
|
|
|
|
|
+ unsigned int mask = ~(1 << (d->irq - JAZZ_IRQ_START));
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
|
|
raw_spin_lock_irqsave(&r4030_lock, flags);
|
|
raw_spin_lock_irqsave(&r4030_lock, flags);
|
|
@@ -47,10 +47,8 @@ void disable_r4030_irq(unsigned int irq)
|
|
|
|
|
|
static struct irq_chip r4030_irq_type = {
|
|
static struct irq_chip r4030_irq_type = {
|
|
.name = "R4030",
|
|
.name = "R4030",
|
|
- .ack = disable_r4030_irq,
|
|
|
|
- .mask = disable_r4030_irq,
|
|
|
|
- .mask_ack = disable_r4030_irq,
|
|
|
|
- .unmask = enable_r4030_irq,
|
|
|
|
|
|
+ .irq_mask = disable_r4030_irq,
|
|
|
|
+ .irq_unmask = enable_r4030_irq,
|
|
};
|
|
};
|
|
|
|
|
|
void __init init_r4030_ints(void)
|
|
void __init init_r4030_ints(void)
|