leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: mach-landisk: irq_data conversion.

Browse Source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2010-10-27 14:53:01 +09:00
parent 8df3a615da
commit 2803a1c681
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/sh/boards/mach-landisk/irq.c
View File

@ -18,25 +18,24 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach-landisk/mach/iodata_landisk.h> #include <mach-landisk/mach/iodata_landisk.h>
static void disable_landisk_irq(unsigned int irq) static void disable_landisk_irq(struct irq_data *data)
{ {
unsigned char mask = 0xff ^ (0x01 << (irq - 5)); unsigned char mask = 0xff ^ (0x01 << (data->irq - 5));
__raw_writeb(__raw_readb(PA_IMASK) & mask, PA_IMASK); __raw_writeb(__raw_readb(PA_IMASK) & mask, PA_IMASK);
} }
static void enable_landisk_irq(unsigned int irq) static void enable_landisk_irq(struct irq_data *data)
{ {
unsigned char value = (0x01 << (irq - 5)); unsigned char value = (0x01 << (data->irq - 5));
__raw_writeb(__raw_readb(PA_IMASK) | value, PA_IMASK); __raw_writeb(__raw_readb(PA_IMASK) | value, PA_IMASK);
} }
static struct irq_chip landisk_irq_chip __read_mostly = { static struct irq_chip landisk_irq_chip __read_mostly = {
.name = "LANDISK", .name = "LANDISK",
.mask = disable_landisk_irq, .irq_mask = disable_landisk_irq,
.unmask = enable_landisk_irq, .irq_unmask = enable_landisk_irq,
.mask_ack = disable_landisk_irq,
}; };
/* /*
@ -50,7 +49,7 @@ void __init init_landisk_IRQ(void)
disable_irq_nosync(i); disable_irq_nosync(i);
set_irq_chip_and_handler_name(i, &landisk_irq_chip, set_irq_chip_and_handler_name(i, &landisk_irq_chip,
handle_level_irq, "level"); handle_level_irq, "level");
enable_landisk_irq(i); enable_landisk_irq(irq_get_irq_data(i));
} }
__raw_writeb(0x00, PA_PWRINT_CLR); __raw_writeb(0x00, PA_PWRINT_CLR);
} }