Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: shark: irq_data conversion.

Browse source 
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
This commit is contained in:
Lennert Buytenhek 2010-11-29 11:12:34 +01:00
parent c4e8964e4e
commit aab0c637f3
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
arch/arm/mach-shark/irq.c
View file

@ -30,35 +30,35 @@ static unsigned char cached_irq_mask[2] = { 0xfb, 0xff };
* These have to be protected by the irq controller spinlock * These have to be protected by the irq controller spinlock
* before being called. * before being called.
*/ */
static void shark_disable_8259A_irq(unsigned int irq) static void shark_disable_8259A_irq(struct irq_data *d)
{ {
unsigned int mask; unsigned int mask;
if (irq<8) { if (d->irq<8) {
mask = 1 << irq; mask = 1 << d->irq;
cached_irq_mask[0] |= mask; cached_irq_mask[0] |= mask;
outb(cached_irq_mask[1],0xA1); outb(cached_irq_mask[1],0xA1);
} else { } else {
mask = 1 << (irq-8); mask = 1 << (d->irq-8);
cached_irq_mask[1] |= mask; cached_irq_mask[1] |= mask;
outb(cached_irq_mask[0],0x21); outb(cached_irq_mask[0],0x21);
} }
} }
static void shark_enable_8259A_irq(unsigned int irq) static void shark_enable_8259A_irq(struct irq_data *d)
{ {
unsigned int mask; unsigned int mask;
if (irq<8) { if (d->irq<8) {
mask = ~(1 << irq); mask = ~(1 << d->irq);
cached_irq_mask[0] &= mask; cached_irq_mask[0] &= mask;
outb(cached_irq_mask[0],0x21); outb(cached_irq_mask[0],0x21);
} else { } else {
mask = ~(1 << (irq-8)); mask = ~(1 << (d->irq-8));
cached_irq_mask[1] &= mask; cached_irq_mask[1] &= mask;
outb(cached_irq_mask[1],0xA1); outb(cached_irq_mask[1],0xA1);
} }
} }
static void shark_ack_8259A_irq(unsigned int irq){} static void shark_ack_8259A_irq(struct irq_data *d){}
static irqreturn_t bogus_int(int irq, void *dev_id) static irqreturn_t bogus_int(int irq, void *dev_id)
{ {
@ -69,10 +69,10 @@ static irqreturn_t bogus_int(int irq, void *dev_id)
static struct irqaction cascade; static struct irqaction cascade;
static struct irq_chip fb_chip = { static struct irq_chip fb_chip = {
.name = "XT-PIC", .name = "XT-PIC",
.ack = shark_ack_8259A_irq, .irq_ack = shark_ack_8259A_irq,
.mask = shark_disable_8259A_irq, .irq_mask = shark_disable_8259A_irq,
.unmask = shark_enable_8259A_irq, .irq_unmask = shark_enable_8259A_irq,
}; };
void __init shark_init_irq(void) void __init shark_init_irq(void)