diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-24 09:59:36 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-24 09:59:36 +0200 |
commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /drivers/gpio/vr41xx_giu.c | |
parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
download | linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.tar.bz2 |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'drivers/gpio/vr41xx_giu.c')
-rw-r--r-- | drivers/gpio/vr41xx_giu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpio/vr41xx_giu.c b/drivers/gpio/vr41xx_giu.c index cffa3bd7ad3b..a365be040b36 100644 --- a/drivers/gpio/vr41xx_giu.c +++ b/drivers/gpio/vr41xx_giu.c @@ -238,13 +238,13 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, break; } } - set_irq_chip_and_handler(GIU_IRQ(pin), + irq_set_chip_and_handler(GIU_IRQ(pin), &giuint_low_irq_chip, handle_edge_irq); } else { giu_clear(GIUINTTYPL, mask); giu_clear(GIUINTHTSELL, mask); - set_irq_chip_and_handler(GIU_IRQ(pin), + irq_set_chip_and_handler(GIU_IRQ(pin), &giuint_low_irq_chip, handle_level_irq); } @@ -273,13 +273,13 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, break; } } - set_irq_chip_and_handler(GIU_IRQ(pin), + irq_set_chip_and_handler(GIU_IRQ(pin), &giuint_high_irq_chip, handle_edge_irq); } else { giu_clear(GIUINTTYPH, mask); giu_clear(GIUINTHTSELH, mask); - set_irq_chip_and_handler(GIU_IRQ(pin), + irq_set_chip_and_handler(GIU_IRQ(pin), &giuint_high_irq_chip, handle_level_irq); } @@ -539,9 +539,9 @@ static int __devinit giu_probe(struct platform_device *pdev) chip = &giuint_high_irq_chip; if (trigger & (1 << pin)) - set_irq_chip_and_handler(i, chip, handle_edge_irq); + irq_set_chip_and_handler(i, chip, handle_edge_irq); else - set_irq_chip_and_handler(i, chip, handle_level_irq); + irq_set_chip_and_handler(i, chip, handle_level_irq); } |