Commit 0dd61be7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-cleanup-for-linus' of... 

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
parents 8dd90265 ab7798ff

arch/arm/mach-ep93xx/gpio.c

+4 −42
Original line number Diff line number Diff line
@@ -360,52 +360,14 @@ static void ep93xx_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) 
	gpio = ep93xx_chip->chip.base;

	for (i = 0; i < chip->ngpio; i++, gpio++) {

		int is_out = data_dir_reg & (1 << i);

		int irq = gpio_to_irq(gpio);



		seq_printf(s, " %s%d gpio-%-3d (%-12s) %s %s",

		seq_printf(s, " %s%d gpio-%-3d (%-12s) %s %s %s\n",

				chip->label, i, gpio,

				gpiochip_is_requested(chip, i) ? : "",

				is_out ? "out" : "in ",

				(data_reg & (1 << i)) ? "hi" : "lo");



		if (!is_out) {

			int irq = gpio_to_irq(gpio);

			struct irq_desc *desc = irq_desc + irq;



			if (irq >= 0 && desc->action) {

				char *trigger;



				switch (desc->status & IRQ_TYPE_SENSE_MASK) {

				case IRQ_TYPE_NONE:

					trigger = "(default)";

					break;

				case IRQ_TYPE_EDGE_FALLING:

					trigger = "edge-falling";

					break;

				case IRQ_TYPE_EDGE_RISING:

					trigger = "edge-rising";

					break;

				case IRQ_TYPE_EDGE_BOTH:

					trigger = "edge-both";

					break;

				case IRQ_TYPE_LEVEL_HIGH:

					trigger = "level-high";

					break;

				case IRQ_TYPE_LEVEL_LOW:

					trigger = "level-low";

					break;

				default:

					trigger = "?trigger?";

					break;

				}



				seq_printf(s, " irq-%d %s%s",

						irq, trigger,

						(desc->status & IRQ_WAKEUP)

							? " wakeup" : "");

			}

		}



		seq_printf(s, "\n");

				(data_reg & (1<<  i)) ? "hi" : "lo",

				(!is_out && irq>= 0) ? "(interrupt)" : "");

	}

}

arch/arm/plat-nomadik/gpio.c

+0 −45
Original line number Diff line number Diff line
@@ -832,51 +832,6 @@ static void nmk_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) 
				: "?  ",

			(mode < 0) ? "unknown" : modes[mode],

			pull ? "pull" : "none");



		if (!is_out) {

			int		irq = gpio_to_irq(gpio);

			struct irq_desc	*desc = irq_to_desc(irq);



			/* This races with request_irq(), set_irq_type(),

			 * and set_irq_wake() ... but those are "rare".

			 *

			 * More significantly, trigger type flags aren't

			 * currently maintained by genirq.

			 */

			if (irq >= 0 && desc->action) {

				char *trigger;



				switch (desc->status & IRQ_TYPE_SENSE_MASK) {

				case IRQ_TYPE_NONE:

					trigger = "(default)";

					break;

				case IRQ_TYPE_EDGE_FALLING:

					trigger = "edge-falling";

					break;

				case IRQ_TYPE_EDGE_RISING:

					trigger = "edge-rising";

					break;

				case IRQ_TYPE_EDGE_BOTH:

					trigger = "edge-both";

					break;

				case IRQ_TYPE_LEVEL_HIGH:

					trigger = "level-high";

					break;

				case IRQ_TYPE_LEVEL_LOW:

					trigger = "level-low";

					break;

				default:

					trigger = "?trigger?";

					break;

				}



				seq_printf(s, " irq-%d %s%s",

					irq, trigger,

					(desc->status & IRQ_WAKEUP)

						? " wakeup" : "");

			}

		}



		seq_printf(s, "\n");

	}

}

arch/avr32/Kconfig

+5 −9
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ config AVR32 
	select HAVE_CLK

	select HAVE_OPROFILE

	select HAVE_KPROBES

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_PROBE

	select HARDIRQS_SW_RESEND

	select GENERIC_IRQ_SHOW

	select GENERIC_HARDIRQS_NO_DEPRECATED

	help

	  AVR32 is a high-performance 32-bit RISC microprocessor core,

	  designed for cost-sensitive embedded applications, with particular
@@ -17,9 +22,6 @@ config AVR32 
config GENERIC_GPIO

	def_bool y



config GENERIC_HARDIRQS

	def_bool y



config STACKTRACE_SUPPORT

	def_bool y
@@ -29,12 +31,6 @@ config LOCKDEP_SUPPORT 
config TRACE_IRQFLAGS_SUPPORT

	def_bool y



config HARDIRQS_SW_RESEND

	def_bool y



config GENERIC_IRQ_PROBE

	def_bool y



config RWSEM_GENERIC_SPINLOCK

	def_bool y

arch/avr32/boards/atngw100/mrmt.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static int __init mrmt1_init(void) 
	/* Select the Touchscreen interrupt pin mode */

	at32_select_periph( GPIO_PIOB_BASE, 1 << (PB_EXTINT_BASE+TS_IRQ),

			GPIO_PERIPH_A, AT32_GPIOF_DEGLITCH);

	set_irq_type( AT32_EXTINT(TS_IRQ), IRQ_TYPE_EDGE_FALLING );

	irq_set_irq_type(AT32_EXTINT(TS_IRQ), IRQ_TYPE_EDGE_FALLING);

	at32_spi_setup_slaves(0,spi01_board_info,ARRAY_SIZE(spi01_board_info));

	spi_register_board_info(spi01_board_info,ARRAY_SIZE(spi01_board_info));

#endif

arch/avr32/boards/atngw100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -322,6 +322,6 @@ static int __init atngw100_arch_init(void) 
	/* set_irq_type() after the arch_initcall for EIC has run, and

	 * before the I2C subsystem could try using this IRQ.

	 */

	return set_irq_type(AT32_EXTINT(3), IRQ_TYPE_EDGE_FALLING);

	return irq_set_irq_type(AT32_EXTINT(3), IRQ_TYPE_EDGE_FALLING);

}

arch_initcall(atngw100_arch_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE