diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-10-27 15:30:07 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 15:30:07 +0900 |
| commit | 15ff2c67ab5c45c7382374bc43a5ad218a36045f (patch) | |
| tree | 0cd183c5d0dd740ee13bec53220bd32fed75450b /arch/sh/boards/mach-se/7722/irq.c | |
| parent | input: hp680_ts_input: ctrl_in/outX to __raw_read/writeX conversion. (diff) | |
| download | linux-dev-15ff2c67ab5c45c7382374bc43a5ad218a36045f.tar.xz linux-dev-15ff2c67ab5c45c7382374bc43a5ad218a36045f.zip | |
sh: mach-se: irq_data conversion.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mach-se/7722/irq.c')
| -rw-r--r-- | arch/sh/boards/mach-se/7722/irq.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/sh/boards/mach-se/7722/irq.c b/arch/sh/boards/mach-se/7722/irq.c index 61605db04ee6..c013f95628ed 100644 --- a/arch/sh/boards/mach-se/7722/irq.c +++ b/arch/sh/boards/mach-se/7722/irq.c @@ -18,23 +18,22 @@ unsigned int se7722_fpga_irq[SE7722_FPGA_IRQ_NR] = { 0, }; -static void disable_se7722_irq(unsigned int irq) +static void disable_se7722_irq(struct irq_data *data) { - unsigned int bit = (unsigned int)get_irq_chip_data(irq); + unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data); __raw_writew(__raw_readw(IRQ01_MASK) | 1 << bit, IRQ01_MASK); } -static void enable_se7722_irq(unsigned int irq) +static void enable_se7722_irq(struct irq_data *data) { - unsigned int bit = (unsigned int)get_irq_chip_data(irq); + unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data); __raw_writew(__raw_readw(IRQ01_MASK) & ~(1 << bit), IRQ01_MASK); } static struct irq_chip se7722_irq_chip __read_mostly = { - .name = "SE7722-FPGA", - .mask = disable_se7722_irq, - .unmask = enable_se7722_irq, - .mask_ack = disable_se7722_irq, + .name = "SE7722-FPGA", + .irq_mask = disable_se7722_irq, + .irq_unmask = enable_se7722_irq, }; static void se7722_irq_demux(unsigned int irq, struct irq_desc *desc) |