From a73aaa037383f6167b9d3694c08beec736474b84 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 24 Sep 2011 02:29:54 +0200 Subject: [PATCH] --- yaml --- r: 273481 b: refs/heads/master c: fe5a8b7f0602b5a536d23cd3468461e9de76256b h: refs/heads/master i: 273479: c4ae17e2a16c05687e71cc8b216210a44a0e0afe v: v3 --- [refs] | 2 +- trunk/arch/mips/jz4740/gpio.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ce84263f6c97..8d7718d9523f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83bc769200802c9ce8fd1c7315fd14198d385b12 +refs/heads/master: fe5a8b7f0602b5a536d23cd3468461e9de76256b diff --git a/trunk/arch/mips/jz4740/gpio.c b/trunk/arch/mips/jz4740/gpio.c index 415d7d7e3283..bbbe12ba60ab 100644 --- a/trunk/arch/mips/jz4740/gpio.c +++ b/trunk/arch/mips/jz4740/gpio.c @@ -301,22 +301,16 @@ static void jz_gpio_irq_demux_handler(unsigned int irq, struct irq_desc *desc) { uint32_t flag; unsigned int gpio_irq; - unsigned int gpio_bank; struct jz_gpio_chip *chip = irq_desc_get_handler_data(desc); - gpio_bank = JZ4740_IRQ_GPIO0 - irq; - flag = readl(chip->base + JZ_REG_GPIO_FLAG); - if (!flag) return; - gpio_irq = __fls(flag); + gpio_irq = chip->irq_base + __fls(flag); jz_gpio_check_trigger_both(chip, irq); - gpio_irq += (gpio_bank << 5) + JZ4740_IRQ_GPIO(0); - generic_handle_irq(gpio_irq); };