diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 23:24:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 23:24:05 -0400 |
commit | 0dd61be7ec1be1b6820af978f901b9ae2c244dc6 (patch) | |
tree | 1f49edaa21351034e7d1dff6511424e9a949cf6b /drivers | |
parent | 8dd90265ac0754da0df47d9c597f25187bb1c947 (diff) | |
parent | ab7798ffcf98b11a9525cf65bacdae3fd58d357f (diff) |
Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (23 commits)
genirq: Expand generic show_interrupts()
gpio: Fold irq_set_chip/irq_set_handler to irq_set_chip_and_handler
gpio: Cleanup genirq namespace
arm: ep93xx: Add basic interrupt info
arm/gpio: Remove three copies of broken and racy debug code
xtensa: Use generic show_interrupts()
xtensa: Convert genirq namespace
xtensa: Use generic IRQ Kconfig and set GENERIC_HARDIRQS_NO_DEPRECATED
xtensa: Convert s6000 gpio irq_chip to new functions
xtensa: Convert main irq_chip to new functions
um: Use generic show_interrupts()
um: Convert genirq namespace
m32r: Use generic show_interrupts()
m32r: Convert genirq namespace
h8300: Use generic show_interrupts()
h8300: Convert genirq namespace
avr32: Cleanup eic_set_irq_type()
avr32: Use generic show_interrupts()
avr: Cleanup genirq namespace
avr32: Use generic IRQ config, enable GENERIC_HARDIRQS_NO_DEPRECATED
...
Fix up trivial conflict in drivers/gpio/timbgpio.c
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpio/adp5588-gpio.c | 8 | ||||
-rw-r--r-- | drivers/gpio/gpiolib.c | 45 | ||||
-rw-r--r-- | drivers/gpio/max732x.c | 8 | ||||
-rw-r--r-- | drivers/gpio/pca953x.c | 6 | ||||
-rw-r--r-- | drivers/gpio/pl061.c | 14 | ||||
-rw-r--r-- | drivers/gpio/stmpe-gpio.c | 12 | ||||
-rw-r--r-- | drivers/gpio/sx150x.c | 9 | ||||
-rw-r--r-- | drivers/gpio/tc3589x-gpio.c | 12 | ||||
-rw-r--r-- | drivers/gpio/timbgpio.c | 18 | ||||
-rw-r--r-- | drivers/gpio/vr41xx_giu.c | 12 |
10 files changed, 49 insertions, 95 deletions
diff --git a/drivers/gpio/adp5588-gpio.c b/drivers/gpio/adp5588-gpio.c index 33fc685cb385..3525ad918771 100644 --- a/drivers/gpio/adp5588-gpio.c +++ b/drivers/gpio/adp5588-gpio.c | |||
@@ -289,10 +289,10 @@ static int adp5588_irq_setup(struct adp5588_gpio *dev) | |||
289 | 289 | ||
290 | for (gpio = 0; gpio < dev->gpio_chip.ngpio; gpio++) { | 290 | for (gpio = 0; gpio < dev->gpio_chip.ngpio; gpio++) { |
291 | int irq = gpio + dev->irq_base; | 291 | int irq = gpio + dev->irq_base; |
292 | set_irq_chip_data(irq, dev); | 292 | irq_set_chip_data(irq, dev); |
293 | set_irq_chip_and_handler(irq, &adp5588_irq_chip, | 293 | irq_set_chip_and_handler(irq, &adp5588_irq_chip, |
294 | handle_level_irq); | 294 | handle_level_irq); |
295 | set_irq_nested_thread(irq, 1); | 295 | irq_set_nested_thread(irq, 1); |
296 | #ifdef CONFIG_ARM | 296 | #ifdef CONFIG_ARM |
297 | /* | 297 | /* |
298 | * ARM needs us to explicitly flag the IRQ as VALID, | 298 | * ARM needs us to explicitly flag the IRQ as VALID, |
@@ -300,7 +300,7 @@ static int adp5588_irq_setup(struct adp5588_gpio *dev) | |||
300 | */ | 300 | */ |
301 | set_irq_flags(irq, IRQF_VALID); | 301 | set_irq_flags(irq, IRQF_VALID); |
302 | #else | 302 | #else |
303 | set_irq_noprobe(irq); | 303 | irq_set_noprobe(irq); |
304 | #endif | 304 | #endif |
305 | } | 305 | } |
306 | 306 | ||
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 649550e2cae9..36a2974815b7 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c | |||
@@ -1656,51 +1656,6 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip) | |||
1656 | chip->get | 1656 | chip->get |
1657 | ? (chip->get(chip, i) ? "hi" : "lo") | 1657 | ? (chip->get(chip, i) ? "hi" : "lo") |
1658 | : "? "); | 1658 | : "? "); |
1659 | |||
1660 | if (!is_out) { | ||
1661 | int irq = gpio_to_irq(gpio); | ||
1662 | struct irq_desc *desc = irq_to_desc(irq); | ||
1663 | |||
1664 | /* This races with request_irq(), set_irq_type(), | ||
1665 | * and set_irq_wake() ... but those are "rare". | ||
1666 | * | ||
1667 | * More significantly, trigger type flags aren't | ||
1668 | * currently maintained by genirq. | ||
1669 | */ | ||
1670 | if (irq >= 0 && desc->action) { | ||
1671 | char *trigger; | ||
1672 | |||
1673 | switch (desc->status & IRQ_TYPE_SENSE_MASK) { | ||
1674 | case IRQ_TYPE_NONE: | ||
1675 | trigger = "(default)"; | ||
1676 | break; | ||
1677 | case IRQ_TYPE_EDGE_FALLING: | ||
1678 | trigger = "edge-falling"; | ||
1679 | break; | ||
1680 | case IRQ_TYPE_EDGE_RISING: | ||
1681 | trigger = "edge-rising"; | ||
1682 | break; | ||
1683 | case IRQ_TYPE_EDGE_BOTH: | ||
1684 | trigger = "edge-both"; | ||
1685 | break; | ||
1686 | case IRQ_TYPE_LEVEL_HIGH: | ||
1687 | trigger = "level-high"; | ||
1688 | break; | ||
1689 | case IRQ_TYPE_LEVEL_LOW: | ||
1690 | trigger = "level-low"; | ||
1691 | break; | ||
1692 | default: | ||
1693 | trigger = "?trigger?"; | ||
1694 | break; | ||
1695 | } | ||
1696 | |||
1697 | seq_printf(s, " irq-%d %s%s", | ||
1698 | irq, trigger, | ||
1699 | (desc->status & IRQ_WAKEUP) | ||
1700 | ? " wakeup" : ""); | ||
1701 | } | ||
1702 | } | ||
1703 | |||
1704 | seq_printf(s, "\n"); | 1659 | seq_printf(s, "\n"); |
1705 | } | 1660 | } |
1706 | } | 1661 | } |
diff --git a/drivers/gpio/max732x.c b/drivers/gpio/max732x.c index 9e1d01f0071a..ad6951edc16c 100644 --- a/drivers/gpio/max732x.c +++ b/drivers/gpio/max732x.c | |||
@@ -470,14 +470,14 @@ static int max732x_irq_setup(struct max732x_chip *chip, | |||
470 | if (!(chip->dir_input & (1 << lvl))) | 470 | if (!(chip->dir_input & (1 << lvl))) |
471 | continue; | 471 | continue; |
472 | 472 | ||
473 | set_irq_chip_data(irq, chip); | 473 | irq_set_chip_data(irq, chip); |
474 | set_irq_chip_and_handler(irq, &max732x_irq_chip, | 474 | irq_set_chip_and_handler(irq, &max732x_irq_chip, |
475 | handle_edge_irq); | 475 | handle_edge_irq); |
476 | set_irq_nested_thread(irq, 1); | 476 | irq_set_nested_thread(irq, 1); |
477 | #ifdef CONFIG_ARM | 477 | #ifdef CONFIG_ARM |
478 | set_irq_flags(irq, IRQF_VALID); | 478 | set_irq_flags(irq, IRQF_VALID); |
479 | #else | 479 | #else |
480 | set_irq_noprobe(irq); | 480 | irq_set_noprobe(irq); |
481 | #endif | 481 | #endif |
482 | } | 482 | } |
483 | 483 | ||
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 2fc25dec7cf5..583e92592073 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c | |||
@@ -395,13 +395,13 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, | |||
395 | for (lvl = 0; lvl < chip->gpio_chip.ngpio; lvl++) { | 395 | for (lvl = 0; lvl < chip->gpio_chip.ngpio; lvl++) { |
396 | int irq = lvl + chip->irq_base; | 396 | int irq = lvl + chip->irq_base; |
397 | 397 | ||
398 | set_irq_chip_data(irq, chip); | 398 | irq_set_chip_data(irq, chip); |
399 | set_irq_chip_and_handler(irq, &pca953x_irq_chip, | 399 | irq_set_chip_and_handler(irq, &pca953x_irq_chip, |
400 | handle_edge_irq); | 400 | handle_edge_irq); |
401 | #ifdef CONFIG_ARM | 401 | #ifdef CONFIG_ARM |
402 | set_irq_flags(irq, IRQF_VALID); | 402 | set_irq_flags(irq, IRQF_VALID); |
403 | #else | 403 | #else |
404 | set_irq_noprobe(irq); | 404 | irq_set_noprobe(irq); |
405 | #endif | 405 | #endif |
406 | } | 406 | } |
407 | 407 | ||
diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c index 838ddbdf90cc..6fcb28cdd862 100644 --- a/drivers/gpio/pl061.c +++ b/drivers/gpio/pl061.c | |||
@@ -210,7 +210,7 @@ static struct irq_chip pl061_irqchip = { | |||
210 | 210 | ||
211 | static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) | 211 | static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) |
212 | { | 212 | { |
213 | struct list_head *chip_list = get_irq_data(irq); | 213 | struct list_head *chip_list = irq_get_handler_data(irq); |
214 | struct list_head *ptr; | 214 | struct list_head *ptr; |
215 | struct pl061_gpio *chip; | 215 | struct pl061_gpio *chip; |
216 | 216 | ||
@@ -294,7 +294,7 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id) | |||
294 | ret = -ENODEV; | 294 | ret = -ENODEV; |
295 | goto iounmap; | 295 | goto iounmap; |
296 | } | 296 | } |
297 | set_irq_chained_handler(irq, pl061_irq_handler); | 297 | irq_set_chained_handler(irq, pl061_irq_handler); |
298 | if (!test_and_set_bit(irq, init_irq)) { /* list initialized? */ | 298 | if (!test_and_set_bit(irq, init_irq)) { /* list initialized? */ |
299 | chip_list = kmalloc(sizeof(*chip_list), GFP_KERNEL); | 299 | chip_list = kmalloc(sizeof(*chip_list), GFP_KERNEL); |
300 | if (chip_list == NULL) { | 300 | if (chip_list == NULL) { |
@@ -303,9 +303,9 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id) | |||
303 | goto iounmap; | 303 | goto iounmap; |
304 | } | 304 | } |
305 | INIT_LIST_HEAD(chip_list); | 305 | INIT_LIST_HEAD(chip_list); |
306 | set_irq_data(irq, chip_list); | 306 | irq_set_handler_data(irq, chip_list); |
307 | } else | 307 | } else |
308 | chip_list = get_irq_data(irq); | 308 | chip_list = irq_get_handler_data(irq); |
309 | list_add(&chip->list, chip_list); | 309 | list_add(&chip->list, chip_list); |
310 | 310 | ||
311 | for (i = 0; i < PL061_GPIO_NR; i++) { | 311 | for (i = 0; i < PL061_GPIO_NR; i++) { |
@@ -315,10 +315,10 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id) | |||
315 | else | 315 | else |
316 | pl061_direction_input(&chip->gc, i); | 316 | pl061_direction_input(&chip->gc, i); |
317 | 317 | ||
318 | set_irq_chip(i+chip->irq_base, &pl061_irqchip); | 318 | irq_set_chip_and_handler(i + chip->irq_base, &pl061_irqchip, |
319 | set_irq_handler(i+chip->irq_base, handle_simple_irq); | 319 | handle_simple_irq); |
320 | set_irq_flags(i+chip->irq_base, IRQF_VALID); | 320 | set_irq_flags(i+chip->irq_base, IRQF_VALID); |
321 | set_irq_chip_data(i+chip->irq_base, chip); | 321 | irq_set_chip_data(i + chip->irq_base, chip); |
322 | } | 322 | } |
323 | 323 | ||
324 | return 0; | 324 | return 0; |
diff --git a/drivers/gpio/stmpe-gpio.c b/drivers/gpio/stmpe-gpio.c index eb2901f8ab5e..4c980b573328 100644 --- a/drivers/gpio/stmpe-gpio.c +++ b/drivers/gpio/stmpe-gpio.c | |||
@@ -254,14 +254,14 @@ static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio) | |||
254 | int irq; | 254 | int irq; |
255 | 255 | ||
256 | for (irq = base; irq < base + stmpe_gpio->chip.ngpio; irq++) { | 256 | for (irq = base; irq < base + stmpe_gpio->chip.ngpio; irq++) { |
257 | set_irq_chip_data(irq, stmpe_gpio); | 257 | irq_set_chip_data(irq, stmpe_gpio); |
258 | set_irq_chip_and_handler(irq, &stmpe_gpio_irq_chip, | 258 | irq_set_chip_and_handler(irq, &stmpe_gpio_irq_chip, |
259 | handle_simple_irq); | 259 | handle_simple_irq); |
260 | set_irq_nested_thread(irq, 1); | 260 | irq_set_nested_thread(irq, 1); |
261 | #ifdef CONFIG_ARM | 261 | #ifdef CONFIG_ARM |
262 | set_irq_flags(irq, IRQF_VALID); | 262 | set_irq_flags(irq, IRQF_VALID); |
263 | #else | 263 | #else |
264 | set_irq_noprobe(irq); | 264 | irq_set_noprobe(irq); |
265 | #endif | 265 | #endif |
266 | } | 266 | } |
267 | 267 | ||
@@ -277,8 +277,8 @@ static void stmpe_gpio_irq_remove(struct stmpe_gpio *stmpe_gpio) | |||
277 | #ifdef CONFIG_ARM | 277 | #ifdef CONFIG_ARM |
278 | set_irq_flags(irq, 0); | 278 | set_irq_flags(irq, 0); |
279 | #endif | 279 | #endif |
280 | set_irq_chip_and_handler(irq, NULL, NULL); | 280 | irq_set_chip_and_handler(irq, NULL, NULL); |
281 | set_irq_chip_data(irq, NULL); | 281 | irq_set_chip_data(irq, NULL); |
282 | } | 282 | } |
283 | } | 283 | } |
284 | 284 | ||
diff --git a/drivers/gpio/sx150x.c b/drivers/gpio/sx150x.c index d2f874c3d3d5..a4f73534394e 100644 --- a/drivers/gpio/sx150x.c +++ b/drivers/gpio/sx150x.c | |||
@@ -551,12 +551,12 @@ static int sx150x_install_irq_chip(struct sx150x_chip *chip, | |||
551 | 551 | ||
552 | for (n = 0; n < chip->dev_cfg->ngpios; ++n) { | 552 | for (n = 0; n < chip->dev_cfg->ngpios; ++n) { |
553 | irq = irq_base + n; | 553 | irq = irq_base + n; |
554 | set_irq_chip_and_handler(irq, &chip->irq_chip, handle_edge_irq); | 554 | irq_set_chip_and_handler(irq, &chip->irq_chip, handle_edge_irq); |
555 | set_irq_nested_thread(irq, 1); | 555 | irq_set_nested_thread(irq, 1); |
556 | #ifdef CONFIG_ARM | 556 | #ifdef CONFIG_ARM |
557 | set_irq_flags(irq, IRQF_VALID); | 557 | set_irq_flags(irq, IRQF_VALID); |
558 | #else | 558 | #else |
559 | set_irq_noprobe(irq); | 559 | irq_set_noprobe(irq); |
560 | #endif | 560 | #endif |
561 | } | 561 | } |
562 | 562 | ||
@@ -583,8 +583,7 @@ static void sx150x_remove_irq_chip(struct sx150x_chip *chip) | |||
583 | 583 | ||
584 | for (n = 0; n < chip->dev_cfg->ngpios; ++n) { | 584 | for (n = 0; n < chip->dev_cfg->ngpios; ++n) { |
585 | irq = chip->irq_base + n; | 585 | irq = chip->irq_base + n; |
586 | set_irq_handler(irq, NULL); | 586 | irq_set_chip_and_handler(irq, NULL, NULL); |
587 | set_irq_chip(irq, NULL); | ||
588 | } | 587 | } |
589 | } | 588 | } |
590 | 589 | ||
diff --git a/drivers/gpio/tc3589x-gpio.c b/drivers/gpio/tc3589x-gpio.c index 27200af1a595..2a82e8999a42 100644 --- a/drivers/gpio/tc3589x-gpio.c +++ b/drivers/gpio/tc3589x-gpio.c | |||
@@ -239,14 +239,14 @@ static int tc3589x_gpio_irq_init(struct tc3589x_gpio *tc3589x_gpio) | |||
239 | int irq; | 239 | int irq; |
240 | 240 | ||
241 | for (irq = base; irq < base + tc3589x_gpio->chip.ngpio; irq++) { | 241 | for (irq = base; irq < base + tc3589x_gpio->chip.ngpio; irq++) { |
242 | set_irq_chip_data(irq, tc3589x_gpio); | 242 | irq_set_chip_data(irq, tc3589x_gpio); |
243 | set_irq_chip_and_handler(irq, &tc3589x_gpio_irq_chip, | 243 | irq_set_chip_and_handler(irq, &tc3589x_gpio_irq_chip, |
244 | handle_simple_irq); | 244 | handle_simple_irq); |
245 | set_irq_nested_thread(irq, 1); | 245 | irq_set_nested_thread(irq, 1); |
246 | #ifdef CONFIG_ARM | 246 | #ifdef CONFIG_ARM |
247 | set_irq_flags(irq, IRQF_VALID); | 247 | set_irq_flags(irq, IRQF_VALID); |
248 | #else | 248 | #else |
249 | set_irq_noprobe(irq); | 249 | irq_set_noprobe(irq); |
250 | #endif | 250 | #endif |
251 | } | 251 | } |
252 | 252 | ||
@@ -262,8 +262,8 @@ static void tc3589x_gpio_irq_remove(struct tc3589x_gpio *tc3589x_gpio) | |||
262 | #ifdef CONFIG_ARM | 262 | #ifdef CONFIG_ARM |
263 | set_irq_flags(irq, 0); | 263 | set_irq_flags(irq, 0); |
264 | #endif | 264 | #endif |
265 | set_irq_chip_and_handler(irq, NULL, NULL); | 265 | irq_set_chip_and_handler(irq, NULL, NULL); |
266 | set_irq_chip_data(irq, NULL); | 266 | irq_set_chip_data(irq, NULL); |
267 | } | 267 | } |
268 | } | 268 | } |
269 | 269 | ||
diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c index ffcd815b8b8b..edbe1eae531f 100644 --- a/drivers/gpio/timbgpio.c +++ b/drivers/gpio/timbgpio.c | |||
@@ -196,7 +196,7 @@ out: | |||
196 | 196 | ||
197 | static void timbgpio_irq(unsigned int irq, struct irq_desc *desc) | 197 | static void timbgpio_irq(unsigned int irq, struct irq_desc *desc) |
198 | { | 198 | { |
199 | struct timbgpio *tgpio = get_irq_data(irq); | 199 | struct timbgpio *tgpio = irq_get_handler_data(irq); |
200 | unsigned long ipr; | 200 | unsigned long ipr; |
201 | int offset; | 201 | int offset; |
202 | 202 | ||
@@ -292,16 +292,16 @@ static int __devinit timbgpio_probe(struct platform_device *pdev) | |||
292 | return 0; | 292 | return 0; |
293 | 293 | ||
294 | for (i = 0; i < pdata->nr_pins; i++) { | 294 | for (i = 0; i < pdata->nr_pins; i++) { |
295 | set_irq_chip_and_handler_name(tgpio->irq_base + i, | 295 | irq_set_chip_and_handler_name(tgpio->irq_base + i, |
296 | &timbgpio_irqchip, handle_simple_irq, "mux"); | 296 | &timbgpio_irqchip, handle_simple_irq, "mux"); |
297 | set_irq_chip_data(tgpio->irq_base + i, tgpio); | 297 | irq_set_chip_data(tgpio->irq_base + i, tgpio); |
298 | #ifdef CONFIG_ARM | 298 | #ifdef CONFIG_ARM |
299 | set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE); | 299 | set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE); |
300 | #endif | 300 | #endif |
301 | } | 301 | } |
302 | 302 | ||
303 | set_irq_data(irq, tgpio); | 303 | irq_set_handler_data(irq, tgpio); |
304 | set_irq_chained_handler(irq, timbgpio_irq); | 304 | irq_set_chained_handler(irq, timbgpio_irq); |
305 | 305 | ||
306 | return 0; | 306 | return 0; |
307 | 307 | ||
@@ -327,12 +327,12 @@ static int __devexit timbgpio_remove(struct platform_device *pdev) | |||
327 | if (irq >= 0 && tgpio->irq_base > 0) { | 327 | if (irq >= 0 && tgpio->irq_base > 0) { |
328 | int i; | 328 | int i; |
329 | for (i = 0; i < tgpio->gpio.ngpio; i++) { | 329 | for (i = 0; i < tgpio->gpio.ngpio; i++) { |
330 | set_irq_chip(tgpio->irq_base + i, NULL); | 330 | irq_set_chip(tgpio->irq_base + i, NULL); |
331 | set_irq_chip_data(tgpio->irq_base + i, NULL); | 331 | irq_set_chip_data(tgpio->irq_base + i, NULL); |
332 | } | 332 | } |
333 | 333 | ||
334 | set_irq_handler(irq, NULL); | 334 | irq_set_handler(irq, NULL); |
335 | set_irq_data(irq, NULL); | 335 | irq_set_handler_data(irq, NULL); |
336 | } | 336 | } |
337 | 337 | ||
338 | err = gpiochip_remove(&tgpio->gpio); | 338 | err = gpiochip_remove(&tgpio->gpio); |
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, | |||
238 | break; | 238 | break; |
239 | } | 239 | } |
240 | } | 240 | } |
241 | set_irq_chip_and_handler(GIU_IRQ(pin), | 241 | irq_set_chip_and_handler(GIU_IRQ(pin), |
242 | &giuint_low_irq_chip, | 242 | &giuint_low_irq_chip, |
243 | handle_edge_irq); | 243 | handle_edge_irq); |
244 | } else { | 244 | } else { |
245 | giu_clear(GIUINTTYPL, mask); | 245 | giu_clear(GIUINTTYPL, mask); |
246 | giu_clear(GIUINTHTSELL, mask); | 246 | giu_clear(GIUINTHTSELL, mask); |
247 | set_irq_chip_and_handler(GIU_IRQ(pin), | 247 | irq_set_chip_and_handler(GIU_IRQ(pin), |
248 | &giuint_low_irq_chip, | 248 | &giuint_low_irq_chip, |
249 | handle_level_irq); | 249 | handle_level_irq); |
250 | } | 250 | } |
@@ -273,13 +273,13 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, | |||
273 | break; | 273 | break; |
274 | } | 274 | } |
275 | } | 275 | } |
276 | set_irq_chip_and_handler(GIU_IRQ(pin), | 276 | irq_set_chip_and_handler(GIU_IRQ(pin), |
277 | &giuint_high_irq_chip, | 277 | &giuint_high_irq_chip, |
278 | handle_edge_irq); | 278 | handle_edge_irq); |
279 | } else { | 279 | } else { |
280 | giu_clear(GIUINTTYPH, mask); | 280 | giu_clear(GIUINTTYPH, mask); |
281 | giu_clear(GIUINTHTSELH, mask); | 281 | giu_clear(GIUINTHTSELH, mask); |
282 | set_irq_chip_and_handler(GIU_IRQ(pin), | 282 | irq_set_chip_and_handler(GIU_IRQ(pin), |
283 | &giuint_high_irq_chip, | 283 | &giuint_high_irq_chip, |
284 | handle_level_irq); | 284 | handle_level_irq); |
285 | } | 285 | } |
@@ -539,9 +539,9 @@ static int __devinit giu_probe(struct platform_device *pdev) | |||
539 | chip = &giuint_high_irq_chip; | 539 | chip = &giuint_high_irq_chip; |
540 | 540 | ||
541 | if (trigger & (1 << pin)) | 541 | if (trigger & (1 << pin)) |
542 | set_irq_chip_and_handler(i, chip, handle_edge_irq); | 542 | irq_set_chip_and_handler(i, chip, handle_edge_irq); |
543 | else | 543 | else |
544 | set_irq_chip_and_handler(i, chip, handle_level_irq); | 544 | irq_set_chip_and_handler(i, chip, handle_level_irq); |
545 | 545 | ||
546 | } | 546 | } |
547 | 547 | ||