evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

m68knommu: Convert coldfire intc-simr irq_chip to new

Browse source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
This commit is contained in:
Thomas Gleixner 2011-02-06 23:39:14 +00:00 • committed by Greg Ungerer
parent 0bc0f3aa14
commit f80c353ce8
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/m68knommu/platform/coldfire/intc-simr.c
View file

@ -20,8 +20,10 @@
#include <asm/mcfsim.h> #include <asm/mcfsim.h>
#include <asm/traps.h> #include <asm/traps.h>
static void intc_irq_mask(unsigned int irq) static void intc_irq_mask(struct irq_data *d)
{ {
unsigned int irq = d->irq;
if (irq >= MCFINT_VECBASE) { if (irq >= MCFINT_VECBASE) {
if (irq < MCFINT_VECBASE + 64) if (irq < MCFINT_VECBASE + 64)
__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_SIMR); __raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_SIMR);
@ -30,8 +32,10 @@ static void intc_irq_mask(unsigned int irq)
} }
} }
static void intc_irq_unmask(unsigned int irq) static void intc_irq_unmask(struct irq_data *d)
{ {
unsigned int irq = d->irq;
if (irq >= MCFINT_VECBASE) { if (irq >= MCFINT_VECBASE) {
if (irq < MCFINT_VECBASE + 64) if (irq < MCFINT_VECBASE + 64)
__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_CIMR); __raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_CIMR);
@ -40,8 +44,10 @@ static void intc_irq_unmask(unsigned int irq)
} }
} }
static int intc_irq_set_type(unsigned int irq, unsigned int type) static int intc_irq_set_type(struct irq_data *d, unsigned int type)
{ {
unsigned int irq = d->irq;
if (irq >= MCFINT_VECBASE) { if (irq >= MCFINT_VECBASE) {
if (irq < MCFINT_VECBASE + 64) if (irq < MCFINT_VECBASE + 64)
__raw_writeb(5, MCFINTC0_ICR0 + irq - MCFINT_VECBASE); __raw_writeb(5, MCFINTC0_ICR0 + irq - MCFINT_VECBASE);
@ -53,9 +59,9 @@ static int intc_irq_set_type(unsigned int irq, unsigned int type)
static struct irq_chip intc_irq_chip = { static struct irq_chip intc_irq_chip = {
.name = "CF-INTC", .name = "CF-INTC",
.mask = intc_irq_mask, .irq_mask = intc_irq_mask,
.unmask = intc_irq_unmask, .irq_unmask = intc_irq_unmask,
.set_type = intc_irq_set_type, .irq_set_type = intc_irq_set_type,
}; };
void __init init_IRQ(void) void __init init_IRQ(void)