Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aba74f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  avr32: Fix missing irq namespace conversion
  powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip
  genirq: Remove the now obsolete config options and select statements
  arm: versatile : Fix typo introduced in irq namespace cleanup
  sound: Fixup the last user of the old irq functions
  genirq: Remove obsolete comment
  genirq: Remove now obsolete set_irq_wake()
  sh: Fix irq cleanup fallout
  x86: apb_timer: Fixup genirq fallout
  genirq: Fix misnamed label in handle_edge_eoi_irq

Fix up crazy conflict in arch/powerpc/include/asm/qe_ic.h:

 - commit eead4d5c ("powerpc: qe_ic: Rename get_irq_desc_data and
   get_irq_desc_chip") made the helper functions use
   irq_desc_get_handler_data() instead of the legacy (and no longer
   existing) get_irq_desc_data.

 - commit d4db35e8 ("powerpc/qe_ic: Fix another breakage from the
   irq_data conversion") used irq_desc_get_chip_data() instead.

According to Thomas, the former is the correct direct conversion, but it
does look like both should work (arch/powerpc/sysdev/qe_lib/qe_ic.c
seems to initialize both to the same thing), and the chip data in some
ways is the more logical.  Somebody should really decide on one of the
other.

This merge picks irq_desc_get_handler_data() as the straightforward pure
conversion to new names, as per Thomas.
parents a8e498b7 dd8ea6af

arch/alpha/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ config ALPHA 
	select GENERIC_IRQ_PROBE

	select AUTO_IRQ_AFFINITY if SMP

	select GENERIC_IRQ_SHOW

	select GENERIC_HARDIRQS_NO_DEPRECATED

	help

	  The Alpha is a 64-bit general-purpose processor designed and

	  marketed by the Digital Equipment Corporation of blessed memory,

arch/arm/mach-versatile/core.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static struct mmci_platform_data mmc0_plat_data = { 
	.gpio_cd	= -1,

};



static struct resource chalcd_resources[] = {

static struct resource char_lcd_resources[] = {

	{

		.start = VERSATILE_CHAR_LCD_BASE,

		.end   = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1),

arch/avr32/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config AVR32 
	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

arch/avr32/mach-at32ap/pio.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static struct irq_chip gpio_irqchip = { 


static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)

{

	struct pio_device	*pio = get_irq_desc_chip_data(desc);

	struct pio_device	*pio = irq_desc_get_chip_data(desc);

	unsigned		gpio_irq;



	gpio_irq = (unsigned) irq_get_handler_data(irq);

arch/blackfin/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ config BLACKFIN 
	select GENERIC_ATOMIC64

	select GENERIC_IRQ_PROBE

	select IRQ_PER_CPU if SMP

	select GENERIC_HARDIRQS_NO_DEPRECATED



config GENERIC_CSUM

	def_bool y