summaryrefslogtreecommitdiff
path: root/arch/sh/boards/mach-x3proto
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-10-27 15:11:01 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-10-27 15:11:01 +0900
commit79c981283ba344f7f51b6aa82e1b8e71bad123b4 (patch)
tree5ec80b54492edc25cff9f0ae6528fe3dd6c8d04a /arch/sh/boards/mach-x3proto
parent5f0103847325dc22fda8749626b56f8b71b98440 (diff)
sh: mach-x3proto: irq_data conversion.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mach-x3proto')
-rw-r--r--arch/sh/boards/mach-x3proto/gpio.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/boards/mach-x3proto/gpio.c b/arch/sh/boards/mach-x3proto/gpio.c
index 594adf76e46a..239e74066253 100644
--- a/arch/sh/boards/mach-x3proto/gpio.c
+++ b/arch/sh/boards/mach-x3proto/gpio.c
@@ -54,18 +54,19 @@ static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
static void x3proto_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
{
- struct irq_chip *chip = get_irq_desc_chip(desc);
+ struct irq_data *data = irq_get_irq_data(irq);
+ struct irq_chip *chip = irq_data_get_irq_chip(data);
unsigned long mask;
int pin;
- chip->mask_ack(irq);
+ chip->irq_mask_ack(data);
mask = __raw_readw(KEYDETR);
for_each_set_bit(pin, &mask, NR_BASEBOARD_GPIOS)
generic_handle_irq(x3proto_gpio_to_irq(NULL, pin));
- chip->unmask(irq);
+ chip->irq_unmask(data);
}
struct gpio_chip x3proto_gpio_chip = {