summaryrefslogtreecommitdiff
path: root/arch/frv
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-29 14:05:13 +0100
committerDavid Howells <dhowells@redhat.com>2011-03-29 14:05:13 +0100
commit12516469756f773ac756ac73c4070ba8efef155a (patch)
tree4a6ada44bc497191f56701146df4d4589e45a350 /arch/frv
parenta4b48a494aef7ab2458b365e00eeebc6c0a2d997 (diff)
downloadlinux-3.10-12516469756f773ac756ac73c4070ba8efef155a.tar.gz
linux-3.10-12516469756f773ac756ac73c4070ba8efef155a.tar.bz2
linux-3.10-12516469756f773ac756ac73c4070ba8efef155a.zip
frv: Convert cpu irq_chip to new functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/kernel/irq.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index d4ec2c6adb0..deaba569007 100644
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -95,35 +95,35 @@ int show_interrupts(struct seq_file *p, void *v)
/*
* on-CPU PIC operations
*/
-static void frv_cpupic_ack(unsigned int irqlevel)
+static void frv_cpupic_ack(struct irq_data *d)
{
- __clr_RC(irqlevel);
+ __clr_RC(d->irq);
__clr_IRL();
}
-static void frv_cpupic_mask(unsigned int irqlevel)
+static void frv_cpupic_mask(struct irq_data *d)
{
- __set_MASK(irqlevel);
+ __set_MASK(d->irq);
}
-static void frv_cpupic_mask_ack(unsigned int irqlevel)
+static void frv_cpupic_mask_ack(struct irq_data *d)
{
- __set_MASK(irqlevel);
- __clr_RC(irqlevel);
+ __set_MASK(d->irq);
+ __clr_RC(d->irq);
__clr_IRL();
}
-static void frv_cpupic_unmask(unsigned int irqlevel)
+static void frv_cpupic_unmask(struct irq_data *d)
{
- __clr_MASK(irqlevel);
+ __clr_MASK(d->irq);
}
static struct irq_chip frv_cpu_pic = {
.name = "cpu",
- .ack = frv_cpupic_ack,
- .mask = frv_cpupic_mask,
- .mask_ack = frv_cpupic_mask_ack,
- .unmask = frv_cpupic_unmask,
+ .irq_ack = frv_cpupic_ack,
+ .irq_mask = frv_cpupic_mask,
+ .irq_mask_ack = frv_cpupic_mask_ack,
+ .irq_unmask = frv_cpupic_unmask,
};
/*