From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Mar 2011 03:24:05 +0000 (-0700)
Subject: Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.6-pxa1908~31182
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=0dd61be7ec1be1b6820af978f901b9ae2c244dc6;p=linux.git

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
---

0dd61be7ec1be1b6820af978f901b9ae2c244dc6
diff --cc drivers/gpio/timbgpio.c
index ffcd815b8b8b,0265872e57d1..edbe1eae531f
--- a/drivers/gpio/timbgpio.c
+++ b/drivers/gpio/timbgpio.c
@@@ -326,13 -326,13 +326,13 @@@ static int __devexit timbgpio_remove(st
  
  	if (irq >= 0 && tgpio->irq_base > 0) {
  		int i;
 -		for (i = 0; i < pdata->nr_pins; i++) {
 +		for (i = 0; i < tgpio->gpio.ngpio; i++) {
- 			set_irq_chip(tgpio->irq_base + i, NULL);
- 			set_irq_chip_data(tgpio->irq_base + i, NULL);
+ 			irq_set_chip(tgpio->irq_base + i, NULL);
+ 			irq_set_chip_data(tgpio->irq_base + i, NULL);
  		}
  
- 		set_irq_handler(irq, NULL);
- 		set_irq_data(irq, NULL);
+ 		irq_set_handler(irq, NULL);
+ 		irq_set_handler_data(irq, NULL);
  	}
  
  	err = gpiochip_remove(&tgpio->gpio);