From: Ingo Molnar This patch-queue improves the generic IRQ layer to be truly generic, by adding various abstractions and features to it, without impacting existing functionality. While the queue can be best described as "fix and improve everything in the generic IRQ layer that we could think of", and thus it consists of many smaller features and lots of cleanups, the one feature that stands out most is the new 'irq chip' abstraction. The irq-chip abstraction is about describing and coding and IRQ controller driver by mapping its raw hardware capabilities [and quirks, if needed] in a straightforward way, without having to think about "IRQ flow" (level/edge/etc.) type of details. This stands in contrast with the current 'irq-type' model of genirq architectures, which 'mixes' raw hardware capabilities with 'flow' details. The patchset supports both types of irq controller designs at once, and converts i386 and x86_64 to the new irq-chip design. As a bonus side-effect of the irq-chip approach, chained interrupt controllers (master/slave PIC constructs, etc.) are now supported by design as well. The end result of this patchset intends to be simpler architecture-level code and more consolidation between architectures. We reused many bits of code and many concepts from Russell King's ARM IRQ layer, the merging of which was one of the motivations for this patchset. This patch: rename desc->handler to desc->chip. Originally i did not want to do this, because it's a big patch. But having both "desc->handler", "desc->handle_irq" and "action->handler" caused a large degree of confusion and made the code appear alot less clean than it truly is. I have also attempted a dual approach as well by introducing a desc->chip alias - but that just wasnt robust enough and broke frequently. So lets get over with this quickly. The conversion was done automatically via scripts and converts all the code in the kernel. This renaming patch is the first one amongst the patches, so that the remaining patches can stay flexible and can be merged and split up without having some big monolithic patch act as a merge barrier. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton --- arch/alpha/kernel/irq.c | 6 +- arch/alpha/kernel/irq_alpha.c | 2 arch/alpha/kernel/irq_i8259.c | 2 arch/alpha/kernel/irq_pyxis.c | 2 arch/alpha/kernel/irq_srm.c | 2 arch/alpha/kernel/sys_alcor.c | 2 arch/alpha/kernel/sys_cabriolet.c | 2 arch/alpha/kernel/sys_dp264.c | 2 arch/alpha/kernel/sys_eb64p.c | 2 arch/alpha/kernel/sys_eiger.c | 2 arch/alpha/kernel/sys_jensen.c | 10 +-- arch/alpha/kernel/sys_marvel.c | 6 +- arch/alpha/kernel/sys_mikasa.c | 2 arch/alpha/kernel/sys_noritake.c | 2 arch/alpha/kernel/sys_rawhide.c | 2 arch/alpha/kernel/sys_rx164.c | 2 arch/alpha/kernel/sys_sable.c | 2 arch/alpha/kernel/sys_takara.c | 2 arch/alpha/kernel/sys_titan.c | 2 arch/alpha/kernel/sys_wildfire.c | 6 +- arch/cris/arch-v10/kernel/irq.c | 2 arch/cris/arch-v32/kernel/irq.c | 2 arch/cris/kernel/irq.c | 2 arch/i386/kernel/i8259.c | 6 +- arch/i386/kernel/io_apic.c | 16 +++-- arch/i386/kernel/irq.c | 6 +- arch/i386/mach-visws/visws_apic.c | 12 ++-- arch/i386/mach-voyager/voyager_smp.c | 2 arch/ia64/kernel/irq.c | 18 +++--- arch/ia64/kernel/irq_ia64.c | 2 arch/ia64/kernel/smpboot.c | 6 +- arch/ia64/sn/kernel/irq.c | 4 - arch/m32r/kernel/irq.c | 2 arch/m32r/kernel/setup_m32104ut.c | 8 +- arch/m32r/kernel/setup_m32700ut.c | 28 +++++----- arch/m32r/kernel/setup_mappi.c | 16 ++--- arch/m32r/kernel/setup_mappi2.c | 20 +++---- arch/m32r/kernel/setup_mappi3.c | 20 +++---- arch/m32r/kernel/setup_oaks32r.c | 12 ++-- arch/m32r/kernel/setup_opsput.c | 28 +++++----- arch/m32r/kernel/setup_usrv.c | 18 +++--- arch/mips/au1000/common/irq.c | 20 +++---- arch/mips/au1000/pb1200/irqmap.c | 2 arch/mips/ddb5xxx/ddb5074/nile4_pic.c | 2 arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c | 2 arch/mips/ddb5xxx/ddb5477/irq_5477.c | 2 arch/mips/dec/ioasic-irq.c | 4 - arch/mips/dec/kn02-irq.c | 2 arch/mips/gt64120/ev64120/irq.c | 2 arch/mips/ite-boards/generic/irq.c | 4 - arch/mips/jazz/irq.c | 2 arch/mips/jmr3927/rbhma3100/irq.c | 2 arch/mips/kernel/i8259.c | 4 - arch/mips/kernel/irq-msc01.c | 4 - arch/mips/kernel/irq-mv6434x.c | 2 arch/mips/kernel/irq-rm7000.c | 2 arch/mips/kernel/irq-rm9000.c | 4 - arch/mips/kernel/irq.c | 4 - arch/mips/kernel/irq_cpu.c | 4 - arch/mips/lasat/interrupt.c | 2 arch/mips/mips-boards/atlas/atlas_int.c | 2 arch/mips/momentum/ocelot_c/cpci-irq.c | 2 arch/mips/momentum/ocelot_c/uart-irq.c | 4 - arch/mips/philips/pnx8550/common/int.c | 10 +-- arch/mips/sgi-ip22/ip22-eisa.c | 4 - arch/mips/sgi-ip22/ip22-int.c | 2 arch/mips/sgi-ip27/ip27-irq.c | 2 arch/mips/sgi-ip32/ip32-irq.c | 2 arch/mips/sibyte/bcm1480/irq.c | 4 - arch/mips/sibyte/sb1250/irq.c | 4 - arch/mips/sni/irq.c | 2 arch/mips/tx4927/common/tx4927_irq.c | 4 - arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 14 ++--- arch/mips/tx4938/common/irq.c | 4 - arch/mips/tx4938/toshiba_rbtx4938/irq.c | 2 arch/mips/vr41xx/common/icu.c | 4 - arch/mips/vr41xx/common/irq.c | 4 - arch/mips/vr41xx/common/vrc4173.c | 2 arch/mips/vr41xx/nec-cmbvr4133/irq.c | 2 arch/parisc/kernel/irq.c | 10 +-- arch/powerpc/kernel/irq.c | 8 +- arch/powerpc/platforms/cell/interrupt.c | 4 - arch/powerpc/platforms/cell/spider-pic.c | 4 - arch/powerpc/platforms/iseries/irq.c | 6 +- arch/powerpc/platforms/powermac/pic.c | 4 - arch/powerpc/platforms/pseries/xics.c | 8 +- arch/powerpc/sysdev/i8259.c | 2 arch/powerpc/sysdev/ipic.c | 2 arch/powerpc/sysdev/mpic.c | 8 +- arch/ppc/8xx_io/commproc.c | 2 arch/ppc/platforms/apus_setup.c | 4 - arch/ppc/platforms/sbc82xx.c | 2 arch/ppc/syslib/cpc700_pic.c | 4 - arch/ppc/syslib/cpm2_pic.c | 2 arch/ppc/syslib/gt64260_pic.c | 2 arch/ppc/syslib/m82xx_pci.c | 2 arch/ppc/syslib/m8xx_setup.c | 4 - arch/ppc/syslib/mpc52xx_pic.c | 4 - arch/ppc/syslib/mv64360_pic.c | 2 arch/ppc/syslib/open_pic.c | 4 - arch/ppc/syslib/open_pic2.c | 2 arch/ppc/syslib/ppc403_pic.c | 2 arch/ppc/syslib/ppc4xx_pic.c | 2 arch/ppc/syslib/xilinx_pic.c | 2 arch/sh/boards/adx/irq_maskreg.c | 2 arch/sh/boards/bigsur/irq.c | 4 - arch/sh/boards/cqreek/irq.c | 4 - arch/sh/boards/dreamcast/setup.c | 2 arch/sh/boards/ec3104/setup.c | 2 arch/sh/boards/harp/irq.c | 2 arch/sh/boards/mpc1211/setup.c | 2 arch/sh/boards/overdrive/irq.c | 2 arch/sh/boards/renesas/hs7751rvoip/irq.c | 2 arch/sh/boards/renesas/rts7751r2d/irq.c | 2 arch/sh/boards/renesas/systemh/irq.c | 2 arch/sh/boards/se/73180/irq.c | 2 arch/sh/boards/superh/microdev/irq.c | 2 arch/sh/cchips/hd6446x/hd64461/setup.c | 2 arch/sh/cchips/hd6446x/hd64465/setup.c | 2 arch/sh/cchips/voyagergx/irq.c | 2 arch/sh/kernel/cpu/irq/imask.c | 2 arch/sh/kernel/cpu/irq/intc2.c | 2 arch/sh/kernel/cpu/irq/ipr.c | 2 arch/sh/kernel/cpu/irq/pint.c | 2 arch/sh/kernel/irq.c | 2 arch/sh64/kernel/irq.c | 2 arch/sh64/kernel/irq_intc.c | 4 - arch/sh64/mach-cayman/irq.c | 2 arch/um/kernel/irq.c | 6 +- arch/v850/kernel/irq.c | 6 +- arch/x86_64/kernel/i8259.c | 6 +- arch/x86_64/kernel/io_apic.c | 16 +++-- arch/x86_64/kernel/irq.c | 6 +- arch/xtensa/kernel/irq.c | 4 - drivers/char/vr41xx_giu.c | 4 - drivers/parisc/dino.c | 4 - drivers/parisc/eisa.c | 2 drivers/parisc/gsc.c | 8 +- drivers/parisc/iosapic.c | 2 drivers/parisc/superio.c | 2 drivers/pci/msi.c | 6 +- drivers/pcmcia/hd64465_ss.c | 6 +- include/asm-powerpc/hw_irq.h | 12 ++-- include/linux/irq.h | 4 - kernel/irq/autoprobe.c | 10 +-- kernel/irq/handle.c | 14 ++--- kernel/irq/manage.c | 24 ++++---- kernel/irq/migration.c | 8 +- kernel/irq/proc.c | 6 +- kernel/irq/spurious.c | 4 - 150 files changed, 374 insertions(+), 370 deletions(-) diff -puN arch/alpha/kernel/irq_alpha.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/irq_alpha.c --- devel/arch/alpha/kernel/irq_alpha.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/irq_alpha.c 2006-06-02 19:00:19.000000000 -0700 @@ -233,7 +233,7 @@ void __init init_rtc_irq(void) { irq_desc[RTC_IRQ].status = IRQ_DISABLED; - irq_desc[RTC_IRQ].handler = &rtc_irq_type; + irq_desc[RTC_IRQ].chip = &rtc_irq_type; setup_irq(RTC_IRQ, &timer_irqaction); } diff -puN arch/alpha/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/irq.c --- devel/arch/alpha/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -49,7 +49,7 @@ select_smp_affinity(unsigned int irq) static int last_cpu; int cpu = last_cpu + 1; - if (!irq_desc[irq].handler->set_affinity || irq_user_affinity[irq]) + if (!irq_desc[irq].chip->set_affinity || irq_user_affinity[irq]) return 1; while (!cpu_possible(cpu)) @@ -57,7 +57,7 @@ select_smp_affinity(unsigned int irq) last_cpu = cpu; irq_affinity[irq] = cpumask_of_cpu(cpu); - irq_desc[irq].handler->set_affinity(irq, cpumask_of_cpu(cpu)); + irq_desc[irq].chip->set_affinity(irq, cpumask_of_cpu(cpu)); return 0; } #endif /* CONFIG_SMP */ @@ -93,7 +93,7 @@ show_interrupts(struct seq_file *p, void for_each_online_cpu(j) seq_printf(p, "%10u ", kstat_cpu(j).irqs[irq]); #endif - seq_printf(p, " %14s", irq_desc[irq].handler->typename); + seq_printf(p, " %14s", irq_desc[irq].chip->typename); seq_printf(p, " %c%s", (action->flags & SA_INTERRUPT)?'+':' ', action->name); diff -puN arch/alpha/kernel/irq_i8259.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/irq_i8259.c --- devel/arch/alpha/kernel/irq_i8259.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/irq_i8259.c 2006-06-02 19:00:19.000000000 -0700 @@ -109,7 +109,7 @@ init_i8259a_irqs(void) for (i = 0; i < 16; i++) { irq_desc[i].status = IRQ_DISABLED; - irq_desc[i].handler = &i8259a_irq_type; + irq_desc[i].chip = &i8259a_irq_type; } setup_irq(2, &cascade); diff -puN arch/alpha/kernel/irq_pyxis.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/irq_pyxis.c --- devel/arch/alpha/kernel/irq_pyxis.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/irq_pyxis.c 2006-06-02 19:00:19.000000000 -0700 @@ -120,7 +120,7 @@ init_pyxis_irqs(unsigned long ignore_mas if ((ignore_mask >> i) & 1) continue; irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &pyxis_irq_type; + irq_desc[i].chip = &pyxis_irq_type; } setup_irq(16+7, &isa_cascade_irqaction); diff -puN arch/alpha/kernel/irq_srm.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/irq_srm.c --- devel/arch/alpha/kernel/irq_srm.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/irq_srm.c 2006-06-02 19:00:19.000000000 -0700 @@ -67,7 +67,7 @@ init_srm_irqs(long max, unsigned long ig if (i < 64 && ((ignore_mask >> i) & 1)) continue; irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &srm_irq_type; + irq_desc[i].chip = &srm_irq_type; } } diff -puN arch/alpha/kernel/sys_alcor.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_alcor.c --- devel/arch/alpha/kernel/sys_alcor.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_alcor.c 2006-06-02 19:00:19.000000000 -0700 @@ -144,7 +144,7 @@ alcor_init_irq(void) if (i >= 16+20 && i <= 16+30) continue; irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &alcor_irq_type; + irq_desc[i].chip = &alcor_irq_type; } i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq; diff -puN arch/alpha/kernel/sys_cabriolet.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_cabriolet.c --- devel/arch/alpha/kernel/sys_cabriolet.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_cabriolet.c 2006-06-02 19:00:19.000000000 -0700 @@ -124,7 +124,7 @@ common_init_irq(void (*srm_dev_int)(unsi for (i = 16; i < 35; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &cabriolet_irq_type; + irq_desc[i].chip = &cabriolet_irq_type; } } diff -puN arch/alpha/kernel/sys_dp264.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_dp264.c --- devel/arch/alpha/kernel/sys_dp264.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_dp264.c 2006-06-02 19:00:19.000000000 -0700 @@ -300,7 +300,7 @@ init_tsunami_irqs(struct hw_interrupt_ty long i; for (i = imin; i <= imax; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = ops; + irq_desc[i].chip = ops; } } diff -puN arch/alpha/kernel/sys_eb64p.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_eb64p.c --- devel/arch/alpha/kernel/sys_eb64p.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_eb64p.c 2006-06-02 19:00:19.000000000 -0700 @@ -137,7 +137,7 @@ eb64p_init_irq(void) for (i = 16; i < 32; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &eb64p_irq_type; + irq_desc[i].chip = &eb64p_irq_type; } common_init_isa_dma(); diff -puN arch/alpha/kernel/sys_eiger.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_eiger.c --- devel/arch/alpha/kernel/sys_eiger.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_eiger.c 2006-06-02 19:00:19.000000000 -0700 @@ -154,7 +154,7 @@ eiger_init_irq(void) for (i = 16; i < 128; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &eiger_irq_type; + irq_desc[i].chip = &eiger_irq_type; } } diff -puN arch/alpha/kernel/sys_jensen.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_jensen.c --- devel/arch/alpha/kernel/sys_jensen.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_jensen.c 2006-06-02 19:00:19.000000000 -0700 @@ -206,11 +206,11 @@ jensen_init_irq(void) { init_i8259a_irqs(); - irq_desc[1].handler = &jensen_local_irq_type; - irq_desc[4].handler = &jensen_local_irq_type; - irq_desc[3].handler = &jensen_local_irq_type; - irq_desc[7].handler = &jensen_local_irq_type; - irq_desc[9].handler = &jensen_local_irq_type; + irq_desc[1].chip = &jensen_local_irq_type; + irq_desc[4].chip = &jensen_local_irq_type; + irq_desc[3].chip = &jensen_local_irq_type; + irq_desc[7].chip = &jensen_local_irq_type; + irq_desc[9].chip = &jensen_local_irq_type; common_init_isa_dma(); } diff -puN arch/alpha/kernel/sys_marvel.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_marvel.c --- devel/arch/alpha/kernel/sys_marvel.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_marvel.c 2006-06-02 19:00:19.000000000 -0700 @@ -303,7 +303,7 @@ init_io7_irqs(struct io7 *io7, /* Set up the lsi irqs. */ for (i = 0; i < 128; ++i) { irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[base + i].handler = lsi_ops; + irq_desc[base + i].chip = lsi_ops; } /* Disable the implemented irqs in hardware. */ @@ -317,7 +317,7 @@ init_io7_irqs(struct io7 *io7, /* Set up the msi irqs. */ for (i = 128; i < (128 + 512); ++i) { irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[base + i].handler = msi_ops; + irq_desc[base + i].chip = msi_ops; } for (i = 0; i < 16; ++i) @@ -335,7 +335,7 @@ marvel_init_irq(void) /* Reserve the legacy irqs. */ for (i = 0; i < 16; ++i) { irq_desc[i].status = IRQ_DISABLED; - irq_desc[i].handler = &marvel_legacy_irq_type; + irq_desc[i].chip = &marvel_legacy_irq_type; } /* Init the io7 irqs. */ diff -puN arch/alpha/kernel/sys_mikasa.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_mikasa.c --- devel/arch/alpha/kernel/sys_mikasa.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_mikasa.c 2006-06-02 19:00:19.000000000 -0700 @@ -117,7 +117,7 @@ mikasa_init_irq(void) for (i = 16; i < 32; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &mikasa_irq_type; + irq_desc[i].chip = &mikasa_irq_type; } init_i8259a_irqs(); diff -puN arch/alpha/kernel/sys_noritake.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_noritake.c --- devel/arch/alpha/kernel/sys_noritake.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_noritake.c 2006-06-02 19:00:19.000000000 -0700 @@ -139,7 +139,7 @@ noritake_init_irq(void) for (i = 16; i < 48; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &noritake_irq_type; + irq_desc[i].chip = &noritake_irq_type; } init_i8259a_irqs(); diff -puN arch/alpha/kernel/sys_rawhide.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_rawhide.c --- devel/arch/alpha/kernel/sys_rawhide.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_rawhide.c 2006-06-02 19:00:19.000000000 -0700 @@ -180,7 +180,7 @@ rawhide_init_irq(void) for (i = 16; i < 128; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &rawhide_irq_type; + irq_desc[i].chip = &rawhide_irq_type; } init_i8259a_irqs(); diff -puN arch/alpha/kernel/sys_rx164.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_rx164.c --- devel/arch/alpha/kernel/sys_rx164.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_rx164.c 2006-06-02 19:00:19.000000000 -0700 @@ -117,7 +117,7 @@ rx164_init_irq(void) rx164_update_irq_hw(0); for (i = 16; i < 40; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &rx164_irq_type; + irq_desc[i].chip = &rx164_irq_type; } init_i8259a_irqs(); diff -puN arch/alpha/kernel/sys_sable.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_sable.c --- devel/arch/alpha/kernel/sys_sable.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_sable.c 2006-06-02 19:00:19.000000000 -0700 @@ -537,7 +537,7 @@ sable_lynx_init_irq(int nr_irqs) for (i = 0; i < nr_irqs; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &sable_lynx_irq_type; + irq_desc[i].chip = &sable_lynx_irq_type; } common_init_isa_dma(); diff -puN arch/alpha/kernel/sys_takara.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_takara.c --- devel/arch/alpha/kernel/sys_takara.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_takara.c 2006-06-02 19:00:19.000000000 -0700 @@ -154,7 +154,7 @@ takara_init_irq(void) for (i = 16; i < 128; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = &takara_irq_type; + irq_desc[i].chip = &takara_irq_type; } common_init_isa_dma(); diff -puN arch/alpha/kernel/sys_titan.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_titan.c --- devel/arch/alpha/kernel/sys_titan.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_titan.c 2006-06-02 19:00:19.000000000 -0700 @@ -189,7 +189,7 @@ init_titan_irqs(struct hw_interrupt_type long i; for (i = imin; i <= imax; ++i) { irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i].handler = ops; + irq_desc[i].chip = ops; } } diff -puN arch/alpha/kernel/sys_wildfire.c~genirq-rename-desc-handler-to-desc-chip arch/alpha/kernel/sys_wildfire.c --- devel/arch/alpha/kernel/sys_wildfire.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/alpha/kernel/sys_wildfire.c 2006-06-02 19:00:19.000000000 -0700 @@ -199,14 +199,14 @@ wildfire_init_irq_per_pca(int qbbno, int if (i == 2) continue; irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i+irq_bias].handler = &wildfire_irq_type; + irq_desc[i+irq_bias].chip = &wildfire_irq_type; } irq_desc[36+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[36+irq_bias].handler = &wildfire_irq_type; + irq_desc[36+irq_bias].chip = &wildfire_irq_type; for (i = 40; i < 64; ++i) { irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL; - irq_desc[i+irq_bias].handler = &wildfire_irq_type; + irq_desc[i+irq_bias].chip = &wildfire_irq_type; } setup_irq(32+irq_bias, &isa_enable); diff -puN arch/cris/arch-v10/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/cris/arch-v10/kernel/irq.c --- devel/arch/cris/arch-v10/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/cris/arch-v10/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -172,7 +172,7 @@ init_IRQ(void) /* Initialize IRQ handler descriptiors. */ for(i = 2; i < NR_IRQS; i++) { - irq_desc[i].handler = &crisv10_irq_type; + irq_desc[i].chip = &crisv10_irq_type; set_int_vector(i, interrupt[i]); } diff -puN arch/cris/arch-v32/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/cris/arch-v32/kernel/irq.c --- devel/arch/cris/arch-v32/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/cris/arch-v32/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -369,7 +369,7 @@ init_IRQ(void) /* Point all IRQ's to bad handlers. */ for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) { - irq_desc[j].handler = &crisv32_irq_type; + irq_desc[j].chip = &crisv32_irq_type; set_exception_vector(i, interrupt[j]); } diff -puN arch/cris/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/cris/kernel/irq.c --- devel/arch/cris/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/cris/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -69,7 +69,7 @@ int show_interrupts(struct seq_file *p, for_each_online_cpu(j) seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); #endif - seq_printf(p, " %14s", irq_desc[i].handler->typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) diff -puN arch/i386/kernel/i8259.c~genirq-rename-desc-handler-to-desc-chip arch/i386/kernel/i8259.c --- devel/arch/i386/kernel/i8259.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/i386/kernel/i8259.c 2006-06-02 19:00:19.000000000 -0700 @@ -132,7 +132,7 @@ void make_8259A_irq(unsigned int irq) { disable_irq_nosync(irq); io_apic_irqs &= ~(1<typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) @@ -282,8 +282,8 @@ void fixup_irqs(cpumask_t map) printk("Breaking affinity for irq %i\n", irq); mask = map; } - if (irq_desc[irq].handler->set_affinity) - irq_desc[irq].handler->set_affinity(irq, mask); + if (irq_desc[irq].chip->set_affinity) + irq_desc[irq].chip->set_affinity(irq, mask); else if (irq_desc[irq].action && !(warned++)) printk("Cannot set affinity for irq %i\n", irq); } diff -puN arch/i386/mach-visws/visws_apic.c~genirq-rename-desc-handler-to-desc-chip arch/i386/mach-visws/visws_apic.c --- devel/arch/i386/mach-visws/visws_apic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/i386/mach-visws/visws_apic.c 2006-06-02 19:00:19.000000000 -0700 @@ -278,22 +278,22 @@ void init_VISWS_APIC_irqs(void) irq_desc[i].depth = 1; if (i == 0) { - irq_desc[i].handler = &cobalt_irq_type; + irq_desc[i].chip = &cobalt_irq_type; } else if (i == CO_IRQ_IDE0) { - irq_desc[i].handler = &cobalt_irq_type; + irq_desc[i].chip = &cobalt_irq_type; } else if (i == CO_IRQ_IDE1) { - irq_desc[i].handler = &cobalt_irq_type; + irq_desc[i].chip = &cobalt_irq_type; } else if (i == CO_IRQ_8259) { - irq_desc[i].handler = &piix4_master_irq_type; + irq_desc[i].chip = &piix4_master_irq_type; } else if (i < CO_IRQ_APIC0) { - irq_desc[i].handler = &piix4_virtual_irq_type; + irq_desc[i].chip = &piix4_virtual_irq_type; } else if (IS_CO_APIC(i)) { - irq_desc[i].handler = &cobalt_irq_type; + irq_desc[i].chip = &cobalt_irq_type; } } diff -puN arch/i386/mach-voyager/voyager_smp.c~genirq-rename-desc-handler-to-desc-chip arch/i386/mach-voyager/voyager_smp.c --- devel/arch/i386/mach-voyager/voyager_smp.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/i386/mach-voyager/voyager_smp.c 2006-06-02 19:00:19.000000000 -0700 @@ -1418,7 +1418,7 @@ smp_intr_init(void) * This is for later: first 16 correspond to PC IRQs; next 16 * are Primary MC IRQs and final 16 are Secondary MC IRQs */ for(i = 0; i < 48; i++) - irq_desc[i].handler = &vic_irq_type; + irq_desc[i].chip = &vic_irq_type; } /* send a CPI at level cpi to a set of cpus in cpuset (set 1 bit per diff -puN arch/ia64/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/ia64/kernel/irq.c --- devel/arch/ia64/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); } #endif - seq_printf(p, " %14s", irq_desc[i].handler->typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) @@ -144,15 +144,15 @@ static void migrate_irqs(void) /* * Al three are essential, currently WARN_ON.. maybe panic? */ - if (desc->handler && desc->handler->disable && - desc->handler->enable && desc->handler->set_affinity) { - desc->handler->disable(irq); - desc->handler->set_affinity(irq, mask); - desc->handler->enable(irq); + if (desc->chip && desc->chip->disable && + desc->chip->enable && desc->chip->set_affinity) { + desc->chip->disable(irq); + desc->chip->set_affinity(irq, mask); + desc->chip->enable(irq); } else { - WARN_ON((!(desc->handler) || !(desc->handler->disable) || - !(desc->handler->enable) || - !(desc->handler->set_affinity))); + WARN_ON((!(desc->chip) || !(desc->chip->disable) || + !(desc->chip->enable) || + !(desc->chip->set_affinity))); } } } diff -puN arch/ia64/kernel/irq_ia64.c~genirq-rename-desc-handler-to-desc-chip arch/ia64/kernel/irq_ia64.c --- devel/arch/ia64/kernel/irq_ia64.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/irq_ia64.c 2006-06-02 19:00:19.000000000 -0700 @@ -251,7 +251,7 @@ register_percpu_irq (ia64_vector vec, st if (irq_to_vector(irq) == vec) { desc = irq_descp(irq); desc->status |= IRQ_PER_CPU; - desc->handler = &irq_type_ia64_lsapic; + desc->chip = &irq_type_ia64_lsapic; if (action) setup_irq(irq, action); } diff -puN arch/ia64/kernel/smpboot.c~genirq-rename-desc-handler-to-desc-chip arch/ia64/kernel/smpboot.c --- devel/arch/ia64/kernel/smpboot.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/smpboot.c 2006-06-02 19:00:19.000000000 -0700 @@ -684,9 +684,9 @@ int migrate_platform_irqs(unsigned int c * polling before making changes. */ if (desc) { - desc->handler->disable(ia64_cpe_irq); - desc->handler->set_affinity(ia64_cpe_irq, mask); - desc->handler->enable(ia64_cpe_irq); + desc->chip->disable(ia64_cpe_irq); + desc->chip->set_affinity(ia64_cpe_irq, mask); + desc->chip->enable(ia64_cpe_irq); printk ("Re-targetting CPEI to cpu %d\n", new_cpei_cpu); } } diff -puN arch/ia64/sn/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/ia64/sn/kernel/irq.c --- devel/arch/ia64/sn/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ia64/sn/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -225,8 +225,8 @@ void sn_irq_init(void) ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR; for (i = 0; i < NR_IRQS; i++) { - if (base_desc[i].handler == &no_irq_type) { - base_desc[i].handler = &irq_type_sn; + if (base_desc[i].chip == &no_irq_type) { + base_desc[i].chip = &irq_type_sn; } } } diff -puN arch/m32r/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/irq.c --- devel/arch/m32r/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -54,7 +54,7 @@ int show_interrupts(struct seq_file *p, for_each_online_cpu(j) seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); #endif - seq_printf(p, " %14s", irq_desc[i].handler->typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) diff -puN arch/m32r/kernel/setup_m32104ut.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/setup_m32104ut.c --- devel/arch/m32r/kernel/setup_m32104ut.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/setup_m32104ut.c 2006-06-02 19:00:19.000000000 -0700 @@ -87,7 +87,7 @@ void __init init_IRQ(void) #if defined(CONFIG_SMC91X) /* INT#0: LAN controller on M32104UT-LAN (SMC91C111)*/ irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT0].handler = &m32104ut_irq_type; + irq_desc[M32R_IRQ_INT0].chip = &m32104ut_irq_type; irq_desc[M32R_IRQ_INT0].action = 0; irq_desc[M32R_IRQ_INT0].depth = 1; icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD11; /* "H" level sense */ @@ -96,7 +96,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_MFT2].handler = &m32104ut_irq_type; + irq_desc[M32R_IRQ_MFT2].chip = &m32104ut_irq_type; irq_desc[M32R_IRQ_MFT2].action = 0; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; @@ -105,7 +105,7 @@ void __init init_IRQ(void) #ifdef CONFIG_SERIAL_M32R_SIO /* SIO0_R : uart receive data */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_R].handler = &m32104ut_irq_type; + irq_desc[M32R_IRQ_SIO0_R].chip = &m32104ut_irq_type; irq_desc[M32R_IRQ_SIO0_R].action = 0; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = M32R_ICUCR_IEN; @@ -113,7 +113,7 @@ void __init init_IRQ(void) /* SIO0_S : uart send data */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_S].handler = &m32104ut_irq_type; + irq_desc[M32R_IRQ_SIO0_S].chip = &m32104ut_irq_type; irq_desc[M32R_IRQ_SIO0_S].action = 0; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = M32R_ICUCR_IEN; diff -puN arch/m32r/kernel/setup_m32700ut.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/setup_m32700ut.c --- devel/arch/m32r/kernel/setup_m32700ut.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/setup_m32700ut.c 2006-06-02 19:00:19.000000000 -0700 @@ -301,7 +301,7 @@ void __init init_IRQ(void) #if defined(CONFIG_SMC91X) /* INT#0: LAN controller on M32700UT-LAN (SMC91C111)*/ irq_desc[M32700UT_LAN_IRQ_LAN].status = IRQ_DISABLED; - irq_desc[M32700UT_LAN_IRQ_LAN].handler = &m32700ut_lanpld_irq_type; + irq_desc[M32700UT_LAN_IRQ_LAN].chip = &m32700ut_lanpld_irq_type; irq_desc[M32700UT_LAN_IRQ_LAN].action = 0; irq_desc[M32700UT_LAN_IRQ_LAN].depth = 1; /* disable nested irq */ lanpld_icu_data[irq2lanpldirq(M32700UT_LAN_IRQ_LAN)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02; /* "H" edge sense */ @@ -310,7 +310,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_MFT2].handler = &m32700ut_irq_type; + irq_desc[M32R_IRQ_MFT2].chip = &m32700ut_irq_type; irq_desc[M32R_IRQ_MFT2].action = 0; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; @@ -318,7 +318,7 @@ void __init init_IRQ(void) /* SIO0 : receive */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_R].handler = &m32700ut_irq_type; + irq_desc[M32R_IRQ_SIO0_R].chip = &m32700ut_irq_type; irq_desc[M32R_IRQ_SIO0_R].action = 0; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = 0; @@ -326,7 +326,7 @@ void __init init_IRQ(void) /* SIO0 : send */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_S].handler = &m32700ut_irq_type; + irq_desc[M32R_IRQ_SIO0_S].chip = &m32700ut_irq_type; irq_desc[M32R_IRQ_SIO0_S].action = 0; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = 0; @@ -334,7 +334,7 @@ void __init init_IRQ(void) /* SIO1 : receive */ irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_R].handler = &m32700ut_irq_type; + irq_desc[M32R_IRQ_SIO1_R].chip = &m32700ut_irq_type; irq_desc[M32R_IRQ_SIO1_R].action = 0; irq_desc[M32R_IRQ_SIO1_R].depth = 1; icu_data[M32R_IRQ_SIO1_R].icucr = 0; @@ -342,7 +342,7 @@ void __init init_IRQ(void) /* SIO1 : send */ irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_S].handler = &m32700ut_irq_type; + irq_desc[M32R_IRQ_SIO1_S].chip = &m32700ut_irq_type; irq_desc[M32R_IRQ_SIO1_S].action = 0; irq_desc[M32R_IRQ_SIO1_S].depth = 1; icu_data[M32R_IRQ_SIO1_S].icucr = 0; @@ -350,7 +350,7 @@ void __init init_IRQ(void) /* DMA1 : */ irq_desc[M32R_IRQ_DMA1].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_DMA1].handler = &m32700ut_irq_type; + irq_desc[M32R_IRQ_DMA1].chip = &m32700ut_irq_type; irq_desc[M32R_IRQ_DMA1].action = 0; irq_desc[M32R_IRQ_DMA1].depth = 1; icu_data[M32R_IRQ_DMA1].icucr = 0; @@ -359,7 +359,7 @@ void __init init_IRQ(void) #ifdef CONFIG_SERIAL_M32R_PLDSIO /* INT#1: SIO0 Receive on PLD */ irq_desc[PLD_IRQ_SIO0_RCV].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_SIO0_RCV].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_SIO0_RCV].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_SIO0_RCV].action = 0; irq_desc[PLD_IRQ_SIO0_RCV].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_RCV)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03; @@ -367,7 +367,7 @@ void __init init_IRQ(void) /* INT#1: SIO0 Send on PLD */ irq_desc[PLD_IRQ_SIO0_SND].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_SIO0_SND].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_SIO0_SND].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_SIO0_SND].action = 0; irq_desc[PLD_IRQ_SIO0_SND].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_SND)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03; @@ -376,7 +376,7 @@ void __init init_IRQ(void) /* INT#1: CFC IREQ on PLD */ irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFIREQ].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_CFIREQ].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_CFIREQ].action = 0; irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_CFIREQ)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01; /* 'L' level sense */ @@ -384,7 +384,7 @@ void __init init_IRQ(void) /* INT#1: CFC Insert on PLD */ irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFC_INSERT].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_CFC_INSERT].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_CFC_INSERT].action = 0; irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_CFC_INSERT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD00; /* 'L' edge sense */ @@ -392,7 +392,7 @@ void __init init_IRQ(void) /* INT#1: CFC Eject on PLD */ irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFC_EJECT].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_CFC_EJECT].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_CFC_EJECT].action = 0; irq_desc[PLD_IRQ_CFC_EJECT].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_CFC_EJECT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02; /* 'H' edge sense */ @@ -416,7 +416,7 @@ void __init init_IRQ(void) outw(USBCR_OTGS, USBCR); /* USBCR: non-OTG */ irq_desc[M32700UT_LCD_IRQ_USB_INT1].status = IRQ_DISABLED; - irq_desc[M32700UT_LCD_IRQ_USB_INT1].handler = &m32700ut_lcdpld_irq_type; + irq_desc[M32700UT_LCD_IRQ_USB_INT1].chip = &m32700ut_lcdpld_irq_type; irq_desc[M32700UT_LCD_IRQ_USB_INT1].action = 0; irq_desc[M32700UT_LCD_IRQ_USB_INT1].depth = 1; lcdpld_icu_data[irq2lcdpldirq(M32700UT_LCD_IRQ_USB_INT1)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01; /* "L" level sense */ @@ -434,7 +434,7 @@ void __init init_IRQ(void) * INT3# is used for AR */ irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT3].handler = &m32700ut_irq_type; + irq_desc[M32R_IRQ_INT3].chip = &m32700ut_irq_type; irq_desc[M32R_IRQ_INT3].action = 0; irq_desc[M32R_IRQ_INT3].depth = 1; icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; diff -puN arch/m32r/kernel/setup_mappi2.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/setup_mappi2.c --- devel/arch/m32r/kernel/setup_mappi2.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/setup_mappi2.c 2006-06-02 19:00:19.000000000 -0700 @@ -87,7 +87,7 @@ void __init init_IRQ(void) #if defined(CONFIG_SMC91X) /* INT0 : LAN controller (SMC91111) */ irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT0].handler = &mappi2_irq_type; + irq_desc[M32R_IRQ_INT0].chip = &mappi2_irq_type; irq_desc[M32R_IRQ_INT0].action = 0; irq_desc[M32R_IRQ_INT0].depth = 1; icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; @@ -96,7 +96,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_MFT2].handler = &mappi2_irq_type; + irq_desc[M32R_IRQ_MFT2].chip = &mappi2_irq_type; irq_desc[M32R_IRQ_MFT2].action = 0; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; @@ -105,7 +105,7 @@ void __init init_IRQ(void) #ifdef CONFIG_SERIAL_M32R_SIO /* SIO0_R : uart receive data */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_R].handler = &mappi2_irq_type; + irq_desc[M32R_IRQ_SIO0_R].chip = &mappi2_irq_type; irq_desc[M32R_IRQ_SIO0_R].action = 0; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = 0; @@ -113,14 +113,14 @@ void __init init_IRQ(void) /* SIO0_S : uart send data */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_S].handler = &mappi2_irq_type; + irq_desc[M32R_IRQ_SIO0_S].chip = &mappi2_irq_type; irq_desc[M32R_IRQ_SIO0_S].action = 0; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = 0; disable_mappi2_irq(M32R_IRQ_SIO0_S); /* SIO1_R : uart receive data */ irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_R].handler = &mappi2_irq_type; + irq_desc[M32R_IRQ_SIO1_R].chip = &mappi2_irq_type; irq_desc[M32R_IRQ_SIO1_R].action = 0; irq_desc[M32R_IRQ_SIO1_R].depth = 1; icu_data[M32R_IRQ_SIO1_R].icucr = 0; @@ -128,7 +128,7 @@ void __init init_IRQ(void) /* SIO1_S : uart send data */ irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_S].handler = &mappi2_irq_type; + irq_desc[M32R_IRQ_SIO1_S].chip = &mappi2_irq_type; irq_desc[M32R_IRQ_SIO1_S].action = 0; irq_desc[M32R_IRQ_SIO1_S].depth = 1; icu_data[M32R_IRQ_SIO1_S].icucr = 0; @@ -138,7 +138,7 @@ void __init init_IRQ(void) #if defined(CONFIG_USB) /* INT1 : USB Host controller interrupt */ irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT1].handler = &mappi2_irq_type; + irq_desc[M32R_IRQ_INT1].chip = &mappi2_irq_type; irq_desc[M32R_IRQ_INT1].action = 0; irq_desc[M32R_IRQ_INT1].depth = 1; icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD01; @@ -147,7 +147,7 @@ void __init init_IRQ(void) /* ICUCR40: CFC IREQ */ irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFIREQ].handler = &mappi2_irq_type; + irq_desc[PLD_IRQ_CFIREQ].chip = &mappi2_irq_type; irq_desc[PLD_IRQ_CFIREQ].action = 0; irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; @@ -156,7 +156,7 @@ void __init init_IRQ(void) #if defined(CONFIG_M32R_CFC) /* ICUCR41: CFC Insert */ irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFC_INSERT].handler = &mappi2_irq_type; + irq_desc[PLD_IRQ_CFC_INSERT].chip = &mappi2_irq_type; irq_desc[PLD_IRQ_CFC_INSERT].action = 0; irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; @@ -164,7 +164,7 @@ void __init init_IRQ(void) /* ICUCR42: CFC Eject */ irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFC_EJECT].handler = &mappi2_irq_type; + irq_desc[PLD_IRQ_CFC_EJECT].chip = &mappi2_irq_type; irq_desc[PLD_IRQ_CFC_EJECT].action = 0; irq_desc[PLD_IRQ_CFC_EJECT].depth = 1; /* disable nested irq */ icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; diff -puN arch/m32r/kernel/setup_mappi3.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/setup_mappi3.c --- devel/arch/m32r/kernel/setup_mappi3.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/setup_mappi3.c 2006-06-02 19:00:19.000000000 -0700 @@ -87,7 +87,7 @@ void __init init_IRQ(void) #if defined(CONFIG_SMC91X) /* INT0 : LAN controller (SMC91111) */ irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT0].handler = &mappi3_irq_type; + irq_desc[M32R_IRQ_INT0].chip = &mappi3_irq_type; irq_desc[M32R_IRQ_INT0].action = 0; irq_desc[M32R_IRQ_INT0].depth = 1; icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; @@ -96,7 +96,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_MFT2].handler = &mappi3_irq_type; + irq_desc[M32R_IRQ_MFT2].chip = &mappi3_irq_type; irq_desc[M32R_IRQ_MFT2].action = 0; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; @@ -105,7 +105,7 @@ void __init init_IRQ(void) #ifdef CONFIG_SERIAL_M32R_SIO /* SIO0_R : uart receive data */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_R].handler = &mappi3_irq_type; + irq_desc[M32R_IRQ_SIO0_R].chip = &mappi3_irq_type; irq_desc[M32R_IRQ_SIO0_R].action = 0; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = 0; @@ -113,14 +113,14 @@ void __init init_IRQ(void) /* SIO0_S : uart send data */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_S].handler = &mappi3_irq_type; + irq_desc[M32R_IRQ_SIO0_S].chip = &mappi3_irq_type; irq_desc[M32R_IRQ_SIO0_S].action = 0; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = 0; disable_mappi3_irq(M32R_IRQ_SIO0_S); /* SIO1_R : uart receive data */ irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_R].handler = &mappi3_irq_type; + irq_desc[M32R_IRQ_SIO1_R].chip = &mappi3_irq_type; irq_desc[M32R_IRQ_SIO1_R].action = 0; irq_desc[M32R_IRQ_SIO1_R].depth = 1; icu_data[M32R_IRQ_SIO1_R].icucr = 0; @@ -128,7 +128,7 @@ void __init init_IRQ(void) /* SIO1_S : uart send data */ irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_S].handler = &mappi3_irq_type; + irq_desc[M32R_IRQ_SIO1_S].chip = &mappi3_irq_type; irq_desc[M32R_IRQ_SIO1_S].action = 0; irq_desc[M32R_IRQ_SIO1_S].depth = 1; icu_data[M32R_IRQ_SIO1_S].icucr = 0; @@ -138,7 +138,7 @@ void __init init_IRQ(void) #if defined(CONFIG_USB) /* INT1 : USB Host controller interrupt */ irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT1].handler = &mappi3_irq_type; + irq_desc[M32R_IRQ_INT1].chip = &mappi3_irq_type; irq_desc[M32R_IRQ_INT1].action = 0; irq_desc[M32R_IRQ_INT1].depth = 1; icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD01; @@ -147,7 +147,7 @@ void __init init_IRQ(void) /* CFC IREQ */ irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFIREQ].handler = &mappi3_irq_type; + irq_desc[PLD_IRQ_CFIREQ].chip = &mappi3_irq_type; irq_desc[PLD_IRQ_CFIREQ].action = 0; irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; @@ -156,7 +156,7 @@ void __init init_IRQ(void) #if defined(CONFIG_M32R_CFC) /* ICUCR41: CFC Insert & eject */ irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFC_INSERT].handler = &mappi3_irq_type; + irq_desc[PLD_IRQ_CFC_INSERT].chip = &mappi3_irq_type; irq_desc[PLD_IRQ_CFC_INSERT].action = 0; irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; @@ -166,7 +166,7 @@ void __init init_IRQ(void) /* IDE IREQ */ irq_desc[PLD_IRQ_IDEIREQ].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_IDEIREQ].handler = &mappi3_irq_type; + irq_desc[PLD_IRQ_IDEIREQ].chip = &mappi3_irq_type; irq_desc[PLD_IRQ_IDEIREQ].action = 0; irq_desc[PLD_IRQ_IDEIREQ].depth = 1; /* disable nested irq */ icu_data[PLD_IRQ_IDEIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; diff -puN arch/m32r/kernel/setup_mappi.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/setup_mappi.c --- devel/arch/m32r/kernel/setup_mappi.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/setup_mappi.c 2006-06-02 19:00:19.000000000 -0700 @@ -86,7 +86,7 @@ void __init init_IRQ(void) #ifdef CONFIG_NE2000 /* INT0 : LAN controller (RTL8019AS) */ irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT0].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_INT0].chip = &mappi_irq_type; irq_desc[M32R_IRQ_INT0].action = 0; irq_desc[M32R_IRQ_INT0].depth = 1; icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; @@ -95,7 +95,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_MFT2].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_MFT2].chip = &mappi_irq_type; irq_desc[M32R_IRQ_MFT2].action = 0; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; @@ -104,7 +104,7 @@ void __init init_IRQ(void) #ifdef CONFIG_SERIAL_M32R_SIO /* SIO0_R : uart receive data */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_R].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_SIO0_R].chip = &mappi_irq_type; irq_desc[M32R_IRQ_SIO0_R].action = 0; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = 0; @@ -112,7 +112,7 @@ void __init init_IRQ(void) /* SIO0_S : uart send data */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_S].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_SIO0_S].chip = &mappi_irq_type; irq_desc[M32R_IRQ_SIO0_S].action = 0; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = 0; @@ -120,7 +120,7 @@ void __init init_IRQ(void) /* SIO1_R : uart receive data */ irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_R].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_SIO1_R].chip = &mappi_irq_type; irq_desc[M32R_IRQ_SIO1_R].action = 0; irq_desc[M32R_IRQ_SIO1_R].depth = 1; icu_data[M32R_IRQ_SIO1_R].icucr = 0; @@ -128,7 +128,7 @@ void __init init_IRQ(void) /* SIO1_S : uart send data */ irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_S].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_SIO1_S].chip = &mappi_irq_type; irq_desc[M32R_IRQ_SIO1_S].action = 0; irq_desc[M32R_IRQ_SIO1_S].depth = 1; icu_data[M32R_IRQ_SIO1_S].icucr = 0; @@ -138,7 +138,7 @@ void __init init_IRQ(void) #if defined(CONFIG_M32R_PCC) /* INT1 : pccard0 interrupt */ irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT1].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_INT1].chip = &mappi_irq_type; irq_desc[M32R_IRQ_INT1].action = 0; irq_desc[M32R_IRQ_INT1].depth = 1; icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00; @@ -146,7 +146,7 @@ void __init init_IRQ(void) /* INT2 : pccard1 interrupt */ irq_desc[M32R_IRQ_INT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT2].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_INT2].chip = &mappi_irq_type; irq_desc[M32R_IRQ_INT2].action = 0; irq_desc[M32R_IRQ_INT2].depth = 1; icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00; diff -puN arch/m32r/kernel/setup_oaks32r.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/setup_oaks32r.c --- devel/arch/m32r/kernel/setup_oaks32r.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/setup_oaks32r.c 2006-06-02 19:00:19.000000000 -0700 @@ -85,7 +85,7 @@ void __init init_IRQ(void) #ifdef CONFIG_NE2000 /* INT3 : LAN controller (RTL8019AS) */ irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT3].handler = &oaks32r_irq_type; + irq_desc[M32R_IRQ_INT3].chip = &oaks32r_irq_type; irq_desc[M32R_IRQ_INT3].action = 0; irq_desc[M32R_IRQ_INT3].depth = 1; icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; @@ -94,7 +94,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_MFT2].handler = &oaks32r_irq_type; + irq_desc[M32R_IRQ_MFT2].chip = &oaks32r_irq_type; irq_desc[M32R_IRQ_MFT2].action = 0; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; @@ -103,7 +103,7 @@ void __init init_IRQ(void) #ifdef CONFIG_SERIAL_M32R_SIO /* SIO0_R : uart receive data */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_R].handler = &oaks32r_irq_type; + irq_desc[M32R_IRQ_SIO0_R].chip = &oaks32r_irq_type; irq_desc[M32R_IRQ_SIO0_R].action = 0; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = 0; @@ -111,7 +111,7 @@ void __init init_IRQ(void) /* SIO0_S : uart send data */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_S].handler = &oaks32r_irq_type; + irq_desc[M32R_IRQ_SIO0_S].chip = &oaks32r_irq_type; irq_desc[M32R_IRQ_SIO0_S].action = 0; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = 0; @@ -119,7 +119,7 @@ void __init init_IRQ(void) /* SIO1_R : uart receive data */ irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_R].handler = &oaks32r_irq_type; + irq_desc[M32R_IRQ_SIO1_R].chip = &oaks32r_irq_type; irq_desc[M32R_IRQ_SIO1_R].action = 0; irq_desc[M32R_IRQ_SIO1_R].depth = 1; icu_data[M32R_IRQ_SIO1_R].icucr = 0; @@ -127,7 +127,7 @@ void __init init_IRQ(void) /* SIO1_S : uart send data */ irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_S].handler = &oaks32r_irq_type; + irq_desc[M32R_IRQ_SIO1_S].chip = &oaks32r_irq_type; irq_desc[M32R_IRQ_SIO1_S].action = 0; irq_desc[M32R_IRQ_SIO1_S].depth = 1; icu_data[M32R_IRQ_SIO1_S].icucr = 0; diff -puN arch/m32r/kernel/setup_opsput.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/setup_opsput.c --- devel/arch/m32r/kernel/setup_opsput.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/setup_opsput.c 2006-06-02 19:00:19.000000000 -0700 @@ -302,7 +302,7 @@ void __init init_IRQ(void) #if defined(CONFIG_SMC91X) /* INT#0: LAN controller on OPSPUT-LAN (SMC91C111)*/ irq_desc[OPSPUT_LAN_IRQ_LAN].status = IRQ_DISABLED; - irq_desc[OPSPUT_LAN_IRQ_LAN].handler = &opsput_lanpld_irq_type; + irq_desc[OPSPUT_LAN_IRQ_LAN].chip = &opsput_lanpld_irq_type; irq_desc[OPSPUT_LAN_IRQ_LAN].action = 0; irq_desc[OPSPUT_LAN_IRQ_LAN].depth = 1; /* disable nested irq */ lanpld_icu_data[irq2lanpldirq(OPSPUT_LAN_IRQ_LAN)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02; /* "H" edge sense */ @@ -311,7 +311,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_MFT2].handler = &opsput_irq_type; + irq_desc[M32R_IRQ_MFT2].chip = &opsput_irq_type; irq_desc[M32R_IRQ_MFT2].action = 0; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; @@ -319,7 +319,7 @@ void __init init_IRQ(void) /* SIO0 : receive */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_R].handler = &opsput_irq_type; + irq_desc[M32R_IRQ_SIO0_R].chip = &opsput_irq_type; irq_desc[M32R_IRQ_SIO0_R].action = 0; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = 0; @@ -327,7 +327,7 @@ void __init init_IRQ(void) /* SIO0 : send */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_S].handler = &opsput_irq_type; + irq_desc[M32R_IRQ_SIO0_S].chip = &opsput_irq_type; irq_desc[M32R_IRQ_SIO0_S].action = 0; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = 0; @@ -335,7 +335,7 @@ void __init init_IRQ(void) /* SIO1 : receive */ irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_R].handler = &opsput_irq_type; + irq_desc[M32R_IRQ_SIO1_R].chip = &opsput_irq_type; irq_desc[M32R_IRQ_SIO1_R].action = 0; irq_desc[M32R_IRQ_SIO1_R].depth = 1; icu_data[M32R_IRQ_SIO1_R].icucr = 0; @@ -343,7 +343,7 @@ void __init init_IRQ(void) /* SIO1 : send */ irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_S].handler = &opsput_irq_type; + irq_desc[M32R_IRQ_SIO1_S].chip = &opsput_irq_type; irq_desc[M32R_IRQ_SIO1_S].action = 0; irq_desc[M32R_IRQ_SIO1_S].depth = 1; icu_data[M32R_IRQ_SIO1_S].icucr = 0; @@ -351,7 +351,7 @@ void __init init_IRQ(void) /* DMA1 : */ irq_desc[M32R_IRQ_DMA1].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_DMA1].handler = &opsput_irq_type; + irq_desc[M32R_IRQ_DMA1].chip = &opsput_irq_type; irq_desc[M32R_IRQ_DMA1].action = 0; irq_desc[M32R_IRQ_DMA1].depth = 1; icu_data[M32R_IRQ_DMA1].icucr = 0; @@ -360,7 +360,7 @@ void __init init_IRQ(void) #ifdef CONFIG_SERIAL_M32R_PLDSIO /* INT#1: SIO0 Receive on PLD */ irq_desc[PLD_IRQ_SIO0_RCV].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_SIO0_RCV].handler = &opsput_pld_irq_type; + irq_desc[PLD_IRQ_SIO0_RCV].chip = &opsput_pld_irq_type; irq_desc[PLD_IRQ_SIO0_RCV].action = 0; irq_desc[PLD_IRQ_SIO0_RCV].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_RCV)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03; @@ -368,7 +368,7 @@ void __init init_IRQ(void) /* INT#1: SIO0 Send on PLD */ irq_desc[PLD_IRQ_SIO0_SND].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_SIO0_SND].handler = &opsput_pld_irq_type; + irq_desc[PLD_IRQ_SIO0_SND].chip = &opsput_pld_irq_type; irq_desc[PLD_IRQ_SIO0_SND].action = 0; irq_desc[PLD_IRQ_SIO0_SND].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_SND)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03; @@ -378,7 +378,7 @@ void __init init_IRQ(void) #if defined(CONFIG_M32R_CFC) /* INT#1: CFC IREQ on PLD */ irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFIREQ].handler = &opsput_pld_irq_type; + irq_desc[PLD_IRQ_CFIREQ].chip = &opsput_pld_irq_type; irq_desc[PLD_IRQ_CFIREQ].action = 0; irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_CFIREQ)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01; /* 'L' level sense */ @@ -386,7 +386,7 @@ void __init init_IRQ(void) /* INT#1: CFC Insert on PLD */ irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFC_INSERT].handler = &opsput_pld_irq_type; + irq_desc[PLD_IRQ_CFC_INSERT].chip = &opsput_pld_irq_type; irq_desc[PLD_IRQ_CFC_INSERT].action = 0; irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_CFC_INSERT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD00; /* 'L' edge sense */ @@ -394,7 +394,7 @@ void __init init_IRQ(void) /* INT#1: CFC Eject on PLD */ irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CFC_EJECT].handler = &opsput_pld_irq_type; + irq_desc[PLD_IRQ_CFC_EJECT].chip = &opsput_pld_irq_type; irq_desc[PLD_IRQ_CFC_EJECT].action = 0; irq_desc[PLD_IRQ_CFC_EJECT].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_CFC_EJECT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02; /* 'H' edge sense */ @@ -420,7 +420,7 @@ void __init init_IRQ(void) outw(USBCR_OTGS, USBCR); /* USBCR: non-OTG */ irq_desc[OPSPUT_LCD_IRQ_USB_INT1].status = IRQ_DISABLED; - irq_desc[OPSPUT_LCD_IRQ_USB_INT1].handler = &opsput_lcdpld_irq_type; + irq_desc[OPSPUT_LCD_IRQ_USB_INT1].chip = &opsput_lcdpld_irq_type; irq_desc[OPSPUT_LCD_IRQ_USB_INT1].action = 0; irq_desc[OPSPUT_LCD_IRQ_USB_INT1].depth = 1; lcdpld_icu_data[irq2lcdpldirq(OPSPUT_LCD_IRQ_USB_INT1)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01; /* "L" level sense */ @@ -438,7 +438,7 @@ void __init init_IRQ(void) * INT3# is used for AR */ irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_INT3].handler = &opsput_irq_type; + irq_desc[M32R_IRQ_INT3].chip = &opsput_irq_type; irq_desc[M32R_IRQ_INT3].action = 0; irq_desc[M32R_IRQ_INT3].depth = 1; icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; diff -puN arch/m32r/kernel/setup_usrv.c~genirq-rename-desc-handler-to-desc-chip arch/m32r/kernel/setup_usrv.c --- devel/arch/m32r/kernel/setup_usrv.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/setup_usrv.c 2006-06-02 19:00:19.000000000 -0700 @@ -158,7 +158,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_MFT2].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_MFT2].chip = &mappi_irq_type; irq_desc[M32R_IRQ_MFT2].action = 0; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; @@ -167,7 +167,7 @@ void __init init_IRQ(void) #if defined(CONFIG_SERIAL_M32R_SIO) /* SIO0_R : uart receive data */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_R].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_SIO0_R].chip = &mappi_irq_type; irq_desc[M32R_IRQ_SIO0_R].action = 0; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = 0; @@ -175,7 +175,7 @@ void __init init_IRQ(void) /* SIO0_S : uart send data */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO0_S].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_SIO0_S].chip = &mappi_irq_type; irq_desc[M32R_IRQ_SIO0_S].action = 0; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = 0; @@ -183,7 +183,7 @@ void __init init_IRQ(void) /* SIO1_R : uart receive data */ irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_R].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_SIO1_R].chip = &mappi_irq_type; irq_desc[M32R_IRQ_SIO1_R].action = 0; irq_desc[M32R_IRQ_SIO1_R].depth = 1; icu_data[M32R_IRQ_SIO1_R].icucr = 0; @@ -191,7 +191,7 @@ void __init init_IRQ(void) /* SIO1_S : uart send data */ irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; - irq_desc[M32R_IRQ_SIO1_S].handler = &mappi_irq_type; + irq_desc[M32R_IRQ_SIO1_S].chip = &mappi_irq_type; irq_desc[M32R_IRQ_SIO1_S].action = 0; irq_desc[M32R_IRQ_SIO1_S].depth = 1; icu_data[M32R_IRQ_SIO1_S].icucr = 0; @@ -201,7 +201,7 @@ void __init init_IRQ(void) /* INT#67-#71: CFC#0 IREQ on PLD */ for (i = 0 ; i < CONFIG_CFC_NUM ; i++ ) { irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_CF0 + i].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_CF0 + i].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_CF0 + i].action = 0; irq_desc[PLD_IRQ_CF0 + i].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_CF0 + i)].icucr @@ -212,7 +212,7 @@ void __init init_IRQ(void) #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) /* INT#76: 16552D#0 IREQ on PLD */ irq_desc[PLD_IRQ_UART0].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_UART0].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_UART0].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_UART0].action = 0; irq_desc[PLD_IRQ_UART0].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_UART0)].icucr @@ -221,7 +221,7 @@ void __init init_IRQ(void) /* INT#77: 16552D#1 IREQ on PLD */ irq_desc[PLD_IRQ_UART1].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_UART1].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_UART1].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_UART1].action = 0; irq_desc[PLD_IRQ_UART1].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_UART1)].icucr @@ -232,7 +232,7 @@ void __init init_IRQ(void) #if defined(CONFIG_IDC_AK4524) || defined(CONFIG_IDC_AK4524_MODULE) /* INT#80: AK4524 IREQ on PLD */ irq_desc[PLD_IRQ_SNDINT].status = IRQ_DISABLED; - irq_desc[PLD_IRQ_SNDINT].handler = &m32700ut_pld_irq_type; + irq_desc[PLD_IRQ_SNDINT].chip = &m32700ut_pld_irq_type; irq_desc[PLD_IRQ_SNDINT].action = 0; irq_desc[PLD_IRQ_SNDINT].depth = 1; /* disable nested irq */ pld_icu_data[irq2pldirq(PLD_IRQ_SNDINT)].icucr diff -puN arch/mips/au1000/common/irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/au1000/common/irq.c --- devel/arch/mips/au1000/common/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/au1000/common/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -333,31 +333,31 @@ static void setup_local_irq(unsigned int au_writel(1<<(irq_nr-32), IC1_CFG2CLR); au_writel(1<<(irq_nr-32), IC1_CFG1CLR); au_writel(1<<(irq_nr-32), IC1_CFG0SET); - irq_desc[irq_nr].handler = &rise_edge_irq_type; + irq_desc[irq_nr].chip = &rise_edge_irq_type; break; case INTC_INT_FALL_EDGE: /* 0:1:0 */ au_writel(1<<(irq_nr-32), IC1_CFG2CLR); au_writel(1<<(irq_nr-32), IC1_CFG1SET); au_writel(1<<(irq_nr-32), IC1_CFG0CLR); - irq_desc[irq_nr].handler = &fall_edge_irq_type; + irq_desc[irq_nr].chip = &fall_edge_irq_type; break; case INTC_INT_RISE_AND_FALL_EDGE: /* 0:1:1 */ au_writel(1<<(irq_nr-32), IC1_CFG2CLR); au_writel(1<<(irq_nr-32), IC1_CFG1SET); au_writel(1<<(irq_nr-32), IC1_CFG0SET); - irq_desc[irq_nr].handler = &either_edge_irq_type; + irq_desc[irq_nr].chip = &either_edge_irq_type; break; case INTC_INT_HIGH_LEVEL: /* 1:0:1 */ au_writel(1<<(irq_nr-32), IC1_CFG2SET); au_writel(1<<(irq_nr-32), IC1_CFG1CLR); au_writel(1<<(irq_nr-32), IC1_CFG0SET); - irq_desc[irq_nr].handler = &level_irq_type; + irq_desc[irq_nr].chip = &level_irq_type; break; case INTC_INT_LOW_LEVEL: /* 1:1:0 */ au_writel(1<<(irq_nr-32), IC1_CFG2SET); au_writel(1<<(irq_nr-32), IC1_CFG1SET); au_writel(1<<(irq_nr-32), IC1_CFG0CLR); - irq_desc[irq_nr].handler = &level_irq_type; + irq_desc[irq_nr].chip = &level_irq_type; break; case INTC_INT_DISABLED: /* 0:0:0 */ au_writel(1<<(irq_nr-32), IC1_CFG0CLR); @@ -385,31 +385,31 @@ static void setup_local_irq(unsigned int au_writel(1<typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) @@ -137,7 +137,7 @@ void __init init_IRQ(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = NULL; irq_desc[i].depth = 1; - irq_desc[i].handler = &no_irq_type; + irq_desc[i].chip = &no_irq_type; spin_lock_init(&irq_desc[i].lock); #ifdef CONFIG_MIPS_MT_SMTC irq_hwmask[i] = 0; diff -puN arch/mips/kernel/irq_cpu.c~genirq-rename-desc-handler-to-desc-chip arch/mips/kernel/irq_cpu.c --- devel/arch/mips/kernel/irq_cpu.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/kernel/irq_cpu.c 2006-06-02 19:00:19.000000000 -0700 @@ -167,14 +167,14 @@ void __init mips_cpu_irq_init(int irq_ba irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = NULL; irq_desc[i].depth = 1; - irq_desc[i].handler = &mips_mt_cpu_irq_controller; + irq_desc[i].chip = &mips_mt_cpu_irq_controller; } for (i = irq_base + 2; i < irq_base + 8; i++) { irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = NULL; irq_desc[i].depth = 1; - irq_desc[i].handler = &mips_cpu_irq_controller; + irq_desc[i].chip = &mips_cpu_irq_controller; } mips_cpu_irq_base = irq_base; diff -puN arch/mips/kernel/irq-msc01.c~genirq-rename-desc-handler-to-desc-chip arch/mips/kernel/irq-msc01.c --- devel/arch/mips/kernel/irq-msc01.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/kernel/irq-msc01.c 2006-06-02 19:00:19.000000000 -0700 @@ -174,14 +174,14 @@ void __init init_msc_irqs(unsigned int b switch (imp->im_type) { case MSC01_IRQ_EDGE: - irq_desc[base+n].handler = &msc_edgeirq_type; + irq_desc[base+n].chip = &msc_edgeirq_type; if (cpu_has_veic) MSCIC_WRITE(MSC01_IC_SUP+n*8, MSC01_IC_SUP_EDGE_BIT); else MSCIC_WRITE(MSC01_IC_SUP+n*8, MSC01_IC_SUP_EDGE_BIT | imp->im_lvl); break; case MSC01_IRQ_LEVEL: - irq_desc[base+n].handler = &msc_levelirq_type; + irq_desc[base+n].chip = &msc_levelirq_type; if (cpu_has_veic) MSCIC_WRITE(MSC01_IC_SUP+n*8, 0); else diff -puN arch/mips/kernel/irq-mv6434x.c~genirq-rename-desc-handler-to-desc-chip arch/mips/kernel/irq-mv6434x.c --- devel/arch/mips/kernel/irq-mv6434x.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/kernel/irq-mv6434x.c 2006-06-02 19:00:19.000000000 -0700 @@ -155,7 +155,7 @@ void __init mv64340_irq_init(unsigned in irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 2; - irq_desc[i].handler = &mv64340_irq_type; + irq_desc[i].chip = &mv64340_irq_type; } irq_base = base; diff -puN arch/mips/kernel/irq-rm7000.c~genirq-rename-desc-handler-to-desc-chip arch/mips/kernel/irq-rm7000.c --- devel/arch/mips/kernel/irq-rm7000.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/kernel/irq-rm7000.c 2006-06-02 19:00:19.000000000 -0700 @@ -91,7 +91,7 @@ void __init rm7k_cpu_irq_init(int base) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = NULL; irq_desc[i].depth = 1; - irq_desc[i].handler = &rm7k_irq_controller; + irq_desc[i].chip = &rm7k_irq_controller; } irq_base = base; diff -puN arch/mips/kernel/irq-rm9000.c~genirq-rename-desc-handler-to-desc-chip arch/mips/kernel/irq-rm9000.c --- devel/arch/mips/kernel/irq-rm9000.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/kernel/irq-rm9000.c 2006-06-02 19:00:19.000000000 -0700 @@ -139,11 +139,11 @@ void __init rm9k_cpu_irq_init(int base) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = NULL; irq_desc[i].depth = 1; - irq_desc[i].handler = &rm9k_irq_controller; + irq_desc[i].chip = &rm9k_irq_controller; } rm9000_perfcount_irq = base + 1; - irq_desc[rm9000_perfcount_irq].handler = &rm9k_perfcounter_irq; + irq_desc[rm9000_perfcount_irq].chip = &rm9k_perfcounter_irq; irq_base = base; } diff -puN arch/mips/lasat/interrupt.c~genirq-rename-desc-handler-to-desc-chip arch/mips/lasat/interrupt.c --- devel/arch/mips/lasat/interrupt.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/lasat/interrupt.c 2006-06-02 19:00:19.000000000 -0700 @@ -156,6 +156,6 @@ void __init arch_init_irq(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 1; - irq_desc[i].handler = &lasat_irq_type; + irq_desc[i].chip = &lasat_irq_type; } } diff -puN arch/mips/mips-boards/atlas/atlas_int.c~genirq-rename-desc-handler-to-desc-chip arch/mips/mips-boards/atlas/atlas_int.c --- devel/arch/mips/mips-boards/atlas/atlas_int.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/mips-boards/atlas/atlas_int.c 2006-06-02 19:00:19.000000000 -0700 @@ -215,7 +215,7 @@ void __init arch_init_irq(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 1; - irq_desc[i].handler = &atlas_irq_type; + irq_desc[i].chip = &atlas_irq_type; spin_lock_init(&irq_desc[i].lock); } } diff -puN arch/mips/momentum/ocelot_c/cpci-irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/momentum/ocelot_c/cpci-irq.c --- devel/arch/mips/momentum/ocelot_c/cpci-irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/momentum/ocelot_c/cpci-irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -147,6 +147,6 @@ void cpci_irq_init(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 2; - irq_desc[i].handler = &cpci_irq_type; + irq_desc[i].chip = &cpci_irq_type; } } diff -puN arch/mips/momentum/ocelot_c/uart-irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/momentum/ocelot_c/uart-irq.c --- devel/arch/mips/momentum/ocelot_c/uart-irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/momentum/ocelot_c/uart-irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -137,10 +137,10 @@ void uart_irq_init(void) irq_desc[80].status = IRQ_DISABLED; irq_desc[80].action = 0; irq_desc[80].depth = 2; - irq_desc[80].handler = &uart_irq_type; + irq_desc[80].chip = &uart_irq_type; irq_desc[81].status = IRQ_DISABLED; irq_desc[81].action = 0; irq_desc[81].depth = 2; - irq_desc[81].handler = &uart_irq_type; + irq_desc[81].chip = &uart_irq_type; } diff -puN arch/mips/philips/pnx8550/common/int.c~genirq-rename-desc-handler-to-desc-chip arch/mips/philips/pnx8550/common/int.c --- devel/arch/mips/philips/pnx8550/common/int.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/philips/pnx8550/common/int.c 2006-06-02 19:00:19.000000000 -0700 @@ -236,7 +236,7 @@ void __init arch_init_irq(void) int configPR; for (i = 0; i < PNX8550_INT_CP0_TOTINT; i++) { - irq_desc[i].handler = &level_irq_type; + irq_desc[i].chip = &level_irq_type; pnx8550_ack(i); /* mask the irq just in case */ } @@ -273,7 +273,7 @@ void __init arch_init_irq(void) /* mask/priority is still 0 so we will not get any * interrupts until it is unmasked */ - irq_desc[i].handler = &level_irq_type; + irq_desc[i].chip = &level_irq_type; } /* Priority level 0 */ @@ -282,12 +282,12 @@ void __init arch_init_irq(void) /* Set int vector table address */ PNX8550_GIC_VECTOR_0 = PNX8550_GIC_VECTOR_1 = 0; - irq_desc[MIPS_CPU_GIC_IRQ].handler = &level_irq_type; + irq_desc[MIPS_CPU_GIC_IRQ].chip = &level_irq_type; setup_irq(MIPS_CPU_GIC_IRQ, &gic_action); /* init of Timer interrupts */ for (i = PNX8550_INT_TIMER_MIN; i <= PNX8550_INT_TIMER_MAX; i++) { - irq_desc[i].handler = &level_irq_type; + irq_desc[i].chip = &level_irq_type; } /* Stop Timer 1-3 */ @@ -295,7 +295,7 @@ void __init arch_init_irq(void) configPR |= 0x00000038; write_c0_config7(configPR); - irq_desc[MIPS_CPU_TIMER_IRQ].handler = &level_irq_type; + irq_desc[MIPS_CPU_TIMER_IRQ].chip = &level_irq_type; setup_irq(MIPS_CPU_TIMER_IRQ, &timer_action); } diff -puN arch/mips/sgi-ip22/ip22-eisa.c~genirq-rename-desc-handler-to-desc-chip arch/mips/sgi-ip22/ip22-eisa.c --- devel/arch/mips/sgi-ip22/ip22-eisa.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/sgi-ip22/ip22-eisa.c 2006-06-02 19:00:19.000000000 -0700 @@ -279,9 +279,9 @@ int __init ip22_eisa_init(void) irq_desc[i].action = 0; irq_desc[i].depth = 1; if (i < (SGINT_EISA + 8)) - irq_desc[i].handler = &ip22_eisa1_irq_type; + irq_desc[i].chip = &ip22_eisa1_irq_type; else - irq_desc[i].handler = &ip22_eisa2_irq_type; + irq_desc[i].chip = &ip22_eisa2_irq_type; } /* Cannot use request_irq because of kmalloc not being ready at such diff -puN arch/mips/sgi-ip22/ip22-int.c~genirq-rename-desc-handler-to-desc-chip arch/mips/sgi-ip22/ip22-int.c --- devel/arch/mips/sgi-ip22/ip22-int.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/sgi-ip22/ip22-int.c 2006-06-02 19:00:19.000000000 -0700 @@ -436,7 +436,7 @@ void __init arch_init_irq(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 1; - irq_desc[i].handler = handler; + irq_desc[i].chip = handler; } /* vector handler. this register the IRQ as non-sharable */ diff -puN arch/mips/sgi-ip27/ip27-irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/sgi-ip27/ip27-irq.c --- devel/arch/mips/sgi-ip27/ip27-irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/sgi-ip27/ip27-irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -386,7 +386,7 @@ void __devinit register_bridge_irq(unsig irq_desc[irq].status = IRQ_DISABLED; irq_desc[irq].action = 0; irq_desc[irq].depth = 1; - irq_desc[irq].handler = &bridge_irq_type; + irq_desc[irq].chip = &bridge_irq_type; } int __devinit request_bridge_irq(struct bridge_controller *bc) diff -puN arch/mips/sgi-ip32/ip32-irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/sgi-ip32/ip32-irq.c --- devel/arch/mips/sgi-ip32/ip32-irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/sgi-ip32/ip32-irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -591,7 +591,7 @@ void __init arch_init_irq(void) irq_desc[irq].status = IRQ_DISABLED; irq_desc[irq].action = 0; irq_desc[irq].depth = 0; - irq_desc[irq].handler = controller; + irq_desc[irq].chip = controller; } setup_irq(CRIME_MEMERR_IRQ, &memerr_irq); setup_irq(CRIME_CPUERR_IRQ, &cpuerr_irq); diff -puN arch/mips/sibyte/bcm1480/irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/sibyte/bcm1480/irq.c --- devel/arch/mips/sibyte/bcm1480/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/sibyte/bcm1480/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -276,10 +276,10 @@ void __init init_bcm1480_irqs(void) irq_desc[i].action = 0; irq_desc[i].depth = 1; if (i < BCM1480_NR_IRQS) { - irq_desc[i].handler = &bcm1480_irq_type; + irq_desc[i].chip = &bcm1480_irq_type; bcm1480_irq_owner[i] = 0; } else { - irq_desc[i].handler = &no_irq_type; + irq_desc[i].chip = &no_irq_type; } } } diff -puN arch/mips/sibyte/sb1250/irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/sibyte/sb1250/irq.c --- devel/arch/mips/sibyte/sb1250/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/sibyte/sb1250/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -246,10 +246,10 @@ void __init init_sb1250_irqs(void) irq_desc[i].action = 0; irq_desc[i].depth = 1; if (i < SB1250_NR_IRQS) { - irq_desc[i].handler = &sb1250_irq_type; + irq_desc[i].chip = &sb1250_irq_type; sb1250_irq_owner[i] = 0; } else { - irq_desc[i].handler = &no_irq_type; + irq_desc[i].chip = &no_irq_type; } } } diff -puN arch/mips/sni/irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/sni/irq.c --- devel/arch/mips/sni/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/sni/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -203,7 +203,7 @@ void __init arch_init_irq(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 1; - irq_desc[i].handler = &pciasic_irq_type; + irq_desc[i].chip = &pciasic_irq_type; } change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ2|IE_IRQ3|IE_IRQ4); diff -puN arch/mips/tx4927/common/tx4927_irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/tx4927/common/tx4927_irq.c --- devel/arch/mips/tx4927/common/tx4927_irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/tx4927/common/tx4927_irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -227,7 +227,7 @@ static void __init tx4927_irq_cp0_init(v irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 1; - irq_desc[i].handler = &tx4927_irq_cp0_type; + irq_desc[i].chip = &tx4927_irq_cp0_type; } return; @@ -435,7 +435,7 @@ static void __init tx4927_irq_pic_init(v irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 2; - irq_desc[i].handler = &tx4927_irq_pic_type; + irq_desc[i].chip = &tx4927_irq_pic_type; } setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action); diff -puN arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c --- devel/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -368,7 +368,7 @@ static void __init toshiba_rbtx4927_irq_ irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 3; - irq_desc[i].handler = &toshiba_rbtx4927_irq_ioc_type; + irq_desc[i].chip = &toshiba_rbtx4927_irq_ioc_type; } setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC, @@ -526,7 +526,7 @@ static void __init toshiba_rbtx4927_irq_ irq_desc[i].action = 0; irq_desc[i].depth = ((i < TOSHIBA_RBTX4927_IRQ_ISA_MID) ? (4) : (5)); - irq_desc[i].handler = &toshiba_rbtx4927_irq_isa_type; + irq_desc[i].chip = &toshiba_rbtx4927_irq_isa_type; } setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC, @@ -692,13 +692,13 @@ void toshiba_rbtx4927_irq_dump(char *key { u32 i, j = 0; for (i = 0; i < NR_IRQS; i++) { - if (strcmp(irq_desc[i].handler->typename, "none") + if (strcmp(irq_desc[i].chip->typename, "none") == 0) continue; if ((i >= 1) - && (irq_desc[i - 1].handler->typename == - irq_desc[i].handler->typename)) { + && (irq_desc[i - 1].chip->typename == + irq_desc[i].chip->typename)) { j++; } else { j = 0; @@ -707,12 +707,12 @@ void toshiba_rbtx4927_irq_dump(char *key (TOSHIBA_RBTX4927_IRQ_INFO, "%s irq=0x%02x/%3d s=0x%08x h=0x%08x a=0x%08x ah=0x%08x d=%1d n=%s/%02d\n", key, i, i, irq_desc[i].status, - (u32) irq_desc[i].handler, + (u32) irq_desc[i].chip, (u32) irq_desc[i].action, (u32) (irq_desc[i].action ? irq_desc[i]. action->handler : 0), irq_desc[i].depth, - irq_desc[i].handler->typename, j); + irq_desc[i].chip->typename, j); } } #endif diff -puN arch/mips/tx4938/common/irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/tx4938/common/irq.c --- devel/arch/mips/tx4938/common/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/tx4938/common/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -102,7 +102,7 @@ tx4938_irq_cp0_init(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 1; - irq_desc[i].handler = &tx4938_irq_cp0_type; + irq_desc[i].chip = &tx4938_irq_cp0_type; } return; @@ -306,7 +306,7 @@ tx4938_irq_pic_init(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 2; - irq_desc[i].handler = &tx4938_irq_pic_type; + irq_desc[i].chip = &tx4938_irq_pic_type; } setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action); diff -puN arch/mips/tx4938/toshiba_rbtx4938/irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/tx4938/toshiba_rbtx4938/irq.c --- devel/arch/mips/tx4938/toshiba_rbtx4938/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/tx4938/toshiba_rbtx4938/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -146,7 +146,7 @@ toshiba_rbtx4938_irq_ioc_init(void) irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = 0; irq_desc[i].depth = 3; - irq_desc[i].handler = &toshiba_rbtx4938_irq_ioc_type; + irq_desc[i].chip = &toshiba_rbtx4938_irq_ioc_type; } setup_irq(RBTX4938_IRQ_IOCINT, diff -puN arch/mips/vr41xx/common/icu.c~genirq-rename-desc-handler-to-desc-chip arch/mips/vr41xx/common/icu.c --- devel/arch/mips/vr41xx/common/icu.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/vr41xx/common/icu.c 2006-06-02 19:00:19.000000000 -0700 @@ -722,10 +722,10 @@ static int __init vr41xx_icu_init(void) icu2_write(MGIUINTHREG, 0xffff); for (i = SYSINT1_IRQ_BASE; i <= SYSINT1_IRQ_LAST; i++) - irq_desc[i].handler = &sysint1_irq_type; + irq_desc[i].chip = &sysint1_irq_type; for (i = SYSINT2_IRQ_BASE; i <= SYSINT2_IRQ_LAST; i++) - irq_desc[i].handler = &sysint2_irq_type; + irq_desc[i].chip = &sysint2_irq_type; cascade_irq(INT0_IRQ, icu_get_irq); cascade_irq(INT1_IRQ, icu_get_irq); diff -puN arch/mips/vr41xx/common/irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/vr41xx/common/irq.c --- devel/arch/mips/vr41xx/common/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/vr41xx/common/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -73,13 +73,13 @@ static void irq_dispatch(unsigned int ir if (cascade->get_irq != NULL) { unsigned int source_irq = irq; desc = irq_desc + source_irq; - desc->handler->ack(source_irq); + desc->chip->ack(source_irq); irq = cascade->get_irq(irq, regs); if (irq < 0) atomic_inc(&irq_err_count); else irq_dispatch(irq, regs); - desc->handler->end(source_irq); + desc->chip->end(source_irq); } else do_IRQ(irq, regs); } diff -puN arch/mips/vr41xx/common/vrc4173.c~genirq-rename-desc-handler-to-desc-chip arch/mips/vr41xx/common/vrc4173.c --- devel/arch/mips/vr41xx/common/vrc4173.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/vr41xx/common/vrc4173.c 2006-06-02 19:00:19.000000000 -0700 @@ -483,7 +483,7 @@ static inline int vrc4173_icu_init(int c vr41xx_set_irq_level(GIU_IRQ_TO_PIN(cascade_irq), LEVEL_LOW); for (i = VRC4173_IRQ_BASE; i <= VRC4173_IRQ_LAST; i++) - irq_desc[i].handler = &vrc4173_irq_type; + irq_desc[i].chip = &vrc4173_irq_type; return 0; } diff -puN arch/mips/vr41xx/nec-cmbvr4133/irq.c~genirq-rename-desc-handler-to-desc-chip arch/mips/vr41xx/nec-cmbvr4133/irq.c --- devel/arch/mips/vr41xx/nec-cmbvr4133/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/mips/vr41xx/nec-cmbvr4133/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -104,7 +104,7 @@ void __init rockhopper_init_irq(void) } for (i = I8259_IRQ_BASE; i <= I8259_IRQ_LAST; i++) - irq_desc[i].handler = &i8259_irq_type; + irq_desc[i].chip = &i8259_irq_type; setup_irq(I8259_SLAVE_IRQ, &i8259_slave_cascade); diff -puN arch/parisc/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/parisc/kernel/irq.c --- devel/arch/parisc/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/parisc/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -158,7 +158,7 @@ int show_interrupts(struct seq_file *p, seq_printf(p, "%10u ", kstat_irqs(i)); #endif - seq_printf(p, " %14s", irq_desc[i].handler->typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); #ifndef PARISC_IRQ_CR16_COUNTS seq_printf(p, " %s", action->name); @@ -210,12 +210,12 @@ int cpu_claim_irq(unsigned int irq, stru { if (irq_desc[irq].action) return -EBUSY; - if (irq_desc[irq].handler != &cpu_interrupt_type) + if (irq_desc[irq].chip != &cpu_interrupt_type) return -EBUSY; if (type) { - irq_desc[irq].handler = type; - irq_desc[irq].handler_data = data; + irq_desc[irq].chip = type; + irq_desc[irq].chip_data = data; cpu_interrupt_type.enable(irq); } return 0; @@ -378,7 +378,7 @@ static void claim_cpu_irqs(void) { int i; for (i = CPU_IRQ_BASE; i <= CPU_IRQ_MAX; i++) { - irq_desc[i].handler = &cpu_interrupt_type; + irq_desc[i].chip = &cpu_interrupt_type; } irq_desc[TIMER_IRQ].action = &timer_action; diff -puN arch/powerpc/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/kernel/irq.c --- devel/arch/powerpc/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -119,8 +119,8 @@ int show_interrupts(struct seq_file *p, #else seq_printf(p, "%10u ", kstat_irqs(i)); #endif /* CONFIG_SMP */ - if (desc->handler) - seq_printf(p, " %s ", desc->handler->typename); + if (desc->chip) + seq_printf(p, " %s ", desc->chip->typename); else seq_puts(p, " None "); seq_printf(p, "%s", (desc->status & IRQ_LEVEL) ? "Level " : "Edge "); @@ -168,8 +168,8 @@ void fixup_irqs(cpumask_t map) printk("Breaking affinity for irq %i\n", irq); mask = map; } - if (irq_desc[irq].handler->set_affinity) - irq_desc[irq].handler->set_affinity(irq, mask); + if (irq_desc[irq].chip->set_affinity) + irq_desc[irq].chip->set_affinity(irq, mask); else if (irq_desc[irq].action && !(warned++)) printk("Cannot set affinity for irq %i\n", irq); } diff -puN arch/powerpc/platforms/cell/interrupt.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/platforms/cell/interrupt.c --- devel/arch/powerpc/platforms/cell/interrupt.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/platforms/cell/interrupt.c 2006-06-02 19:00:19.000000000 -0700 @@ -327,7 +327,7 @@ static void iic_request_ipi(int ipi, con irq = iic_ipi_to_irq(ipi); /* IPIs are marked SA_INTERRUPT as they must run with irqs * disabled */ - get_irq_desc(irq)->handler = &iic_pic; + get_irq_desc(irq)->chip = &iic_pic; get_irq_desc(irq)->status |= IRQ_PER_CPU; request_irq(irq, iic_ipi_action, SA_INTERRUPT, name, NULL); } @@ -350,7 +350,7 @@ static void iic_setup_spe_handlers(void) for (be=0; be < num_present_cpus() / 2; be++) { for (isrc = 0; isrc < IIC_CLASS_STRIDE * 3; isrc++) { int irq = IIC_NODE_STRIDE * be + IIC_SPE_OFFSET + isrc; - get_irq_desc(irq)->handler = &iic_pic; + get_irq_desc(irq)->chip = &iic_pic; } } } diff -puN arch/powerpc/platforms/cell/spider-pic.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/platforms/cell/spider-pic.c --- devel/arch/powerpc/platforms/cell/spider-pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/platforms/cell/spider-pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -162,7 +162,7 @@ void spider_init_IRQ_hardcoded(void) spider_pics[node] = ioremap(spiderpic, 0x800); for (n = 0; n < IIC_NUM_EXT; n++) { int irq = n + IIC_EXT_OFFSET + node * IIC_NODE_STRIDE; - get_irq_desc(irq)->handler = &spider_pic; + get_irq_desc(irq)->chip = &spider_pic; } /* do not mask any interrupts because of level */ @@ -217,7 +217,7 @@ void spider_init_IRQ(void) for (n = 0; n < IIC_NUM_EXT; n++) { int irq = n + IIC_EXT_OFFSET + node * IIC_NODE_STRIDE; - get_irq_desc(irq)->handler = &spider_pic; + get_irq_desc(irq)->chip = &spider_pic; } /* do not mask any interrupts because of level */ diff -puN arch/powerpc/platforms/iseries/irq.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/platforms/iseries/irq.c --- devel/arch/powerpc/platforms/iseries/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/platforms/iseries/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -242,9 +242,9 @@ void __init iSeries_activate_IRQs() for_each_irq (irq) { irq_desc_t *desc = get_irq_desc(irq); - if (desc && desc->handler && desc->handler->startup) { + if (desc && desc->chip && desc->chip->startup) { spin_lock_irqsave(&desc->lock, flags); - desc->handler->startup(irq); + desc->chip->startup(irq); spin_unlock_irqrestore(&desc->lock, flags); } } @@ -324,7 +324,7 @@ int __init iSeries_allocate_IRQ(HvBusNum + function; virtirq = virt_irq_create_mapping(realirq); - irq_desc[virtirq].handler = &iSeries_IRQ_handler; + irq_desc[virtirq].chip = &iSeries_IRQ_handler; return virtirq; } diff -puN arch/powerpc/platforms/powermac/pic.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/platforms/powermac/pic.c --- devel/arch/powerpc/platforms/powermac/pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/platforms/powermac/pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -446,7 +446,7 @@ static void __init pmac_pic_probe_oldsty /* Set the handler for the main PIC */ for ( i = 0; i < max_real_irqs ; i++ ) - irq_desc[i].handler = &pmac_pic; + irq_desc[i].chip = &pmac_pic; /* Get addresses of first controller if we have a node for it */ BUG_ON(of_address_to_resource(master, 0, &r)); @@ -493,7 +493,7 @@ static void __init pmac_pic_probe_oldsty /* Setup handlers for secondary controller and hook cascade irq*/ if (slave) { for ( i = max_real_irqs ; i < max_irqs ; i++ ) - irq_desc[i].handler = &gatwick_pic; + irq_desc[i].chip = &gatwick_pic; setup_irq(irq_cascade, &gatwick_cascade_action); } printk(KERN_INFO "irq: System has %d possible interrupts\n", max_irqs); diff -puN arch/powerpc/platforms/pseries/xics.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/platforms/pseries/xics.c --- devel/arch/powerpc/platforms/pseries/xics.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/platforms/pseries/xics.c 2006-06-02 19:00:19.000000000 -0700 @@ -558,7 +558,7 @@ nextnode: } for (i = irq_offset_value(); i < NR_IRQS; ++i) - get_irq_desc(i)->handler = &xics_pic; + get_irq_desc(i)->chip = &xics_pic; xics_setup_cpu(); @@ -701,9 +701,9 @@ void xics_migrate_irqs_away(void) continue; /* We only need to migrate enabled IRQS */ - if (desc == NULL || desc->handler == NULL + if (desc == NULL || desc->chip == NULL || desc->action == NULL - || desc->handler->set_affinity == NULL) + || desc->chip->set_affinity == NULL) continue; spin_lock_irqsave(&desc->lock, flags); @@ -728,7 +728,7 @@ void xics_migrate_irqs_away(void) virq, cpu); /* Reset affinity to all cpus */ - desc->handler->set_affinity(virq, CPU_MASK_ALL); + desc->chip->set_affinity(virq, CPU_MASK_ALL); irq_affinity[virq] = CPU_MASK_ALL; unlock: spin_unlock_irqrestore(&desc->lock, flags); diff -puN arch/powerpc/sysdev/i8259.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/sysdev/i8259.c --- devel/arch/powerpc/sysdev/i8259.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/sysdev/i8259.c 2006-06-02 19:00:19.000000000 -0700 @@ -208,7 +208,7 @@ void __init i8259_init(unsigned long int spin_unlock_irqrestore(&i8259_lock, flags); for (i = 0; i < NUM_ISA_INTERRUPTS; ++i) - irq_desc[offset + i].handler = &i8259_pic; + irq_desc[offset + i].chip = &i8259_pic; /* reserve our resources */ setup_irq(offset + 2, &i8259_irqaction); diff -puN arch/powerpc/sysdev/ipic.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/sysdev/ipic.c --- devel/arch/powerpc/sysdev/ipic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/sysdev/ipic.c 2006-06-02 19:00:19.000000000 -0700 @@ -472,7 +472,7 @@ void __init ipic_init(phys_addr_t phys_a ipic_write(primary_ipic->regs, IPIC_SEMSR, temp); for (i = 0 ; i < NR_IPIC_INTS ; i++) { - irq_desc[i+irq_offset].handler = &ipic; + irq_desc[i+irq_offset].chip = &ipic; irq_desc[i+irq_offset].status = IRQ_LEVEL; } diff -puN arch/powerpc/sysdev/mpic.c~genirq-rename-desc-handler-to-desc-chip arch/powerpc/sysdev/mpic.c --- devel/arch/powerpc/sysdev/mpic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/powerpc/sysdev/mpic.c 2006-06-02 19:00:19.000000000 -0700 @@ -379,14 +379,14 @@ static inline u32 mpic_physmask(u32 cpum /* Get the mpic structure from the IPI number */ static inline struct mpic * mpic_from_ipi(unsigned int ipi) { - return container_of(irq_desc[ipi].handler, struct mpic, hc_ipi); + return container_of(irq_desc[ipi].chip, struct mpic, hc_ipi); } #endif /* Get the mpic structure from the irq number */ static inline struct mpic * mpic_from_irq(unsigned int irq) { - return container_of(irq_desc[irq].handler, struct mpic, hc_irq); + return container_of(irq_desc[irq].chip, struct mpic, hc_irq); } /* Send an EOI */ @@ -752,7 +752,7 @@ void __init mpic_init(struct mpic *mpic) if (!(mpic->flags & MPIC_PRIMARY)) continue; irq_desc[mpic->ipi_offset+i].status |= IRQ_PER_CPU; - irq_desc[mpic->ipi_offset+i].handler = &mpic->hc_ipi; + irq_desc[mpic->ipi_offset+i].chip = &mpic->hc_ipi; #endif /* CONFIG_SMP */ } @@ -813,7 +813,7 @@ void __init mpic_init(struct mpic *mpic) /* init linux descriptors */ if (i < mpic->irq_count) { irq_desc[mpic->irq_offset+i].status = level ? IRQ_LEVEL : 0; - irq_desc[mpic->irq_offset+i].handler = &mpic->hc_irq; + irq_desc[mpic->irq_offset+i].chip = &mpic->hc_irq; } } diff -puN arch/ppc/8xx_io/commproc.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/8xx_io/commproc.c --- devel/arch/ppc/8xx_io/commproc.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/8xx_io/commproc.c 2006-06-02 19:00:19.000000000 -0700 @@ -187,7 +187,7 @@ cpm_interrupt_init(void) * interrupt vectors */ for ( i = CPM_IRQ_OFFSET ; i < CPM_IRQ_OFFSET + NR_CPM_INTS ; i++ ) - irq_desc[i].handler = &cpm_pic; + irq_desc[i].chip = &cpm_pic; /* Set our interrupt handler with the core CPU. */ if (setup_irq(CPM_INTERRUPT, &cpm_interrupt_irqaction)) diff -puN arch/ppc/platforms/apus_setup.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/platforms/apus_setup.c --- devel/arch/ppc/platforms/apus_setup.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/platforms/apus_setup.c 2006-06-02 19:00:19.000000000 -0700 @@ -734,9 +734,9 @@ void apus_init_IRQ(void) for ( i = 0 ; i < AMI_IRQS; i++ ) { irq_desc[i].status = IRQ_LEVEL; if (i < IRQ_AMIGA_AUTO) { - irq_desc[i].handler = &amiga_irqctrl; + irq_desc[i].chip = &amiga_irqctrl; } else { - irq_desc[i].handler = &amiga_sys_irqctrl; + irq_desc[i].chip = &amiga_sys_irqctrl; action = &amiga_sys_irqaction[i-IRQ_AMIGA_AUTO]; if (action->name) setup_irq(i, action); diff -puN arch/ppc/platforms/sbc82xx.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/platforms/sbc82xx.c --- devel/arch/ppc/platforms/sbc82xx.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/platforms/sbc82xx.c 2006-06-02 19:00:19.000000000 -0700 @@ -172,7 +172,7 @@ void __init sbc82xx_init_IRQ(void) /* Set up the interrupt handlers for the i8259 IRQs */ for (i = NR_SIU_INTS; i < NR_SIU_INTS + 8; i++) { - irq_desc[i].handler = &sbc82xx_i8259_ic; + irq_desc[i].chip = &sbc82xx_i8259_ic; irq_desc[i].status |= IRQ_LEVEL; } diff -puN arch/ppc/syslib/cpc700_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/cpc700_pic.c --- devel/arch/ppc/syslib/cpc700_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/cpc700_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -140,12 +140,12 @@ cpc700_init_IRQ(void) /* IRQ 0 is highest */ for (i = 0; i < 17; i++) { - irq_desc[i].handler = &cpc700_pic; + irq_desc[i].chip = &cpc700_pic; cpc700_pic_init_irq(i); } for (i = 20; i < 32; i++) { - irq_desc[i].handler = &cpc700_pic; + irq_desc[i].chip = &cpc700_pic; cpc700_pic_init_irq(i); } diff -puN arch/ppc/syslib/cpm2_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/cpm2_pic.c --- devel/arch/ppc/syslib/cpm2_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/cpm2_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -171,7 +171,7 @@ void cpm2_init_IRQ(void) /* Enable chaining to OpenPIC, and make everything level */ for (i = 0; i < NR_CPM_INTS; i++) { - irq_desc[i+CPM_IRQ_OFFSET].handler = &cpm2_pic; + irq_desc[i+CPM_IRQ_OFFSET].chip = &cpm2_pic; irq_desc[i+CPM_IRQ_OFFSET].status |= IRQ_LEVEL; } } diff -puN arch/ppc/syslib/gt64260_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/gt64260_pic.c --- devel/arch/ppc/syslib/gt64260_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/gt64260_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -98,7 +98,7 @@ gt64260_init_irq(void) /* use the gt64260 for all (possible) interrupt sources */ for (i = gt64260_irq_base; i < (gt64260_irq_base + 96); i++) - irq_desc[i].handler = >64260_pic; + irq_desc[i].chip = >64260_pic; if (ppc_md.progress) ppc_md.progress("gt64260_init_irq: exit", 0x0); diff -puN arch/ppc/syslib/m82xx_pci.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/m82xx_pci.c --- devel/arch/ppc/syslib/m82xx_pci.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/m82xx_pci.c 2006-06-02 19:00:19.000000000 -0700 @@ -159,7 +159,7 @@ pq2pci_init_irq(void) immap->im_memctl.memc_or8 = 0xffff8010; #endif for (irq = NR_CPM_INTS; irq < NR_CPM_INTS + 4; irq++) - irq_desc[irq].handler = &pq2pci_ic; + irq_desc[irq].chip = &pq2pci_ic; /* make PCI IRQ level sensitive */ immap->im_intctl.ic_siexr &= diff -puN arch/ppc/syslib/m8xx_setup.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/m8xx_setup.c --- devel/arch/ppc/syslib/m8xx_setup.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/m8xx_setup.c 2006-06-02 19:00:19.000000000 -0700 @@ -347,13 +347,13 @@ m8xx_init_IRQ(void) int i; for (i = SIU_IRQ_OFFSET ; i < SIU_IRQ_OFFSET + NR_SIU_INTS ; i++) - irq_desc[i].handler = &ppc8xx_pic; + irq_desc[i].chip = &ppc8xx_pic; cpm_interrupt_init(); #if defined(CONFIG_PCI) for (i = I8259_IRQ_OFFSET ; i < I8259_IRQ_OFFSET + NR_8259_INTS ; i++) - irq_desc[i].handler = &i8259_pic; + irq_desc[i].chip = &i8259_pic; i8259_pic_irq_offset = I8259_IRQ_OFFSET; i8259_init(0); diff -puN arch/ppc/syslib/mpc52xx_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/mpc52xx_pic.c --- devel/arch/ppc/syslib/mpc52xx_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/mpc52xx_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -204,9 +204,9 @@ mpc52xx_init_irq(void) out_be32(&intr->main_pri1, 0); out_be32(&intr->main_pri2, 0); - /* Initialize irq_desc[i].handler's with mpc52xx_ic. */ + /* Initialize irq_desc[i].chip's with mpc52xx_ic. */ for (i = 0; i < NR_IRQS; i++) { - irq_desc[i].handler = &mpc52xx_ic; + irq_desc[i].chip = &mpc52xx_ic; irq_desc[i].status = IRQ_LEVEL; } diff -puN arch/ppc/syslib/mv64360_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/mv64360_pic.c --- devel/arch/ppc/syslib/mv64360_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/mv64360_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -119,7 +119,7 @@ mv64360_init_irq(void) /* All interrupts are level interrupts */ for (i = mv64360_irq_base; i < (mv64360_irq_base + 96); i++) { irq_desc[i].status |= IRQ_LEVEL; - irq_desc[i].handler = &mv64360_pic; + irq_desc[i].chip = &mv64360_pic; } if (ppc_md.progress) diff -puN arch/ppc/syslib/open_pic2.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/open_pic2.c --- devel/arch/ppc/syslib/open_pic2.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/open_pic2.c 2006-06-02 19:00:19.000000000 -0700 @@ -290,7 +290,7 @@ void __init openpic2_init(int offset) /* Init descriptors */ for (i = offset; i < NumSources + offset; i++) - irq_desc[i].handler = &open_pic2; + irq_desc[i].chip = &open_pic2; /* Initialize the spurious interrupt */ if (ppc_md.progress) ppc_md.progress("openpic2: spurious",0x3bd); diff -puN arch/ppc/syslib/open_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/open_pic.c --- devel/arch/ppc/syslib/open_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/open_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -373,7 +373,7 @@ void __init openpic_init(int offset) OPENPIC_VEC_IPI+i+offset); /* IPIs are per-CPU */ irq_desc[OPENPIC_VEC_IPI+i+offset].status |= IRQ_PER_CPU; - irq_desc[OPENPIC_VEC_IPI+i+offset].handler = &open_pic_ipi; + irq_desc[OPENPIC_VEC_IPI+i+offset].chip = &open_pic_ipi; } #endif @@ -408,7 +408,7 @@ void __init openpic_init(int offset) /* Init descriptors */ for (i = offset; i < NumSources + offset; i++) - irq_desc[i].handler = &open_pic; + irq_desc[i].chip = &open_pic; /* Initialize the spurious interrupt */ if (ppc_md.progress) ppc_md.progress("openpic: spurious",0x3bd); diff -puN arch/ppc/syslib/ppc403_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/ppc403_pic.c --- devel/arch/ppc/syslib/ppc403_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/ppc403_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -121,5 +121,5 @@ ppc4xx_pic_init(void) ppc_md.get_irq = ppc403_pic_get_irq; for (i = 0; i < NR_IRQS; i++) - irq_desc[i].handler = &ppc403_aic; + irq_desc[i].chip = &ppc403_aic; } diff -puN arch/ppc/syslib/ppc4xx_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/ppc4xx_pic.c --- devel/arch/ppc/syslib/ppc4xx_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/ppc4xx_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -276,7 +276,7 @@ void __init ppc4xx_pic_init(void) /* Attach low-level handlers */ for (i = 0; i < (NR_UICS << 5); ++i) { - irq_desc[i].handler = &__uic[i >> 5].decl; + irq_desc[i].chip = &__uic[i >> 5].decl; if (is_level_sensitive(i)) irq_desc[i].status |= IRQ_LEVEL; } diff -puN arch/ppc/syslib/xilinx_pic.c~genirq-rename-desc-handler-to-desc-chip arch/ppc/syslib/xilinx_pic.c --- devel/arch/ppc/syslib/xilinx_pic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/ppc/syslib/xilinx_pic.c 2006-06-02 19:00:19.000000000 -0700 @@ -143,7 +143,7 @@ ppc4xx_pic_init(void) ppc_md.get_irq = xilinx_pic_get_irq; for (i = 0; i < NR_IRQS; ++i) { - irq_desc[i].handler = &xilinx_intc; + irq_desc[i].chip = &xilinx_intc; if (XPAR_INTC_0_KIND_OF_INTR & (0x00000001 << i)) irq_desc[i].status &= ~IRQ_LEVEL; diff -puN arch/sh64/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh64/kernel/irq.c --- devel/arch/sh64/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh64/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -65,7 +65,7 @@ int show_interrupts(struct seq_file *p, goto unlock; seq_printf(p, "%3d: ",i); seq_printf(p, "%10u ", kstat_irqs(i)); - seq_printf(p, " %14s", irq_desc[i].handler->typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) diff -puN arch/sh64/kernel/irq_intc.c~genirq-rename-desc-handler-to-desc-chip arch/sh64/kernel/irq_intc.c --- devel/arch/sh64/kernel/irq_intc.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh64/kernel/irq_intc.c 2006-06-02 19:00:19.000000000 -0700 @@ -178,7 +178,7 @@ static void end_intc_irq(unsigned int ir void make_intc_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &intc_irq_type; + irq_desc[irq].chip = &intc_irq_type; disable_intc_irq(irq); } @@ -208,7 +208,7 @@ void __init init_IRQ(void) /* Set default: per-line enable/disable, priority driven ack/eoi */ for (i = 0; i < NR_INTC_IRQS; i++) { if (platform_int_priority[i] != NO_PRIORITY) { - irq_desc[i].handler = &intc_irq_type; + irq_desc[i].chip = &intc_irq_type; } } diff -puN arch/sh64/mach-cayman/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh64/mach-cayman/irq.c --- devel/arch/sh64/mach-cayman/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh64/mach-cayman/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -187,7 +187,7 @@ void init_cayman_irq(void) } for (i=0; i= BIGSUR_IRQ_LOW && irq < BIGSUR_IRQ_HIGH) { /* save the handler in the main description table */ - irq_desc[irq].handler = &bigsur_l1irq_type; + irq_desc[irq].chip = &bigsur_l1irq_type; irq_desc[irq].status = IRQ_DISABLED; irq_desc[irq].action = 0; irq_desc[irq].depth = 1; @@ -270,7 +270,7 @@ static void make_bigsur_l2isr(unsigned i /* sanity check first */ if(irq >= BIGSUR_2NDLVL_IRQ_LOW && irq < BIGSUR_2NDLVL_IRQ_HIGH) { /* save the handler in the main description table */ - irq_desc[irq].handler = &bigsur_l2irq_type; + irq_desc[irq].chip = &bigsur_l2irq_type; irq_desc[irq].status = IRQ_DISABLED; irq_desc[irq].action = 0; irq_desc[irq].depth = 1; diff -puN arch/sh/boards/cqreek/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/cqreek/irq.c --- devel/arch/sh/boards/cqreek/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/cqreek/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -103,7 +103,7 @@ void __init init_cqreek_IRQ(void) cqreek_irq_data[14].stat_port = BRIDGE_IDE_INTR_STAT; cqreek_irq_data[14].bit = 1; - irq_desc[14].handler = &cqreek_irq_type; + irq_desc[14].chip = &cqreek_irq_type; irq_desc[14].status = IRQ_DISABLED; irq_desc[14].action = 0; irq_desc[14].depth = 1; @@ -117,7 +117,7 @@ void __init init_cqreek_IRQ(void) cqreek_irq_data[10].bit = (1 << 10); /* XXX: Err... we may need demultiplexer for ISA irq... */ - irq_desc[10].handler = &cqreek_irq_type; + irq_desc[10].chip = &cqreek_irq_type; irq_desc[10].status = IRQ_DISABLED; irq_desc[10].action = 0; irq_desc[10].depth = 1; diff -puN arch/sh/boards/dreamcast/setup.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/dreamcast/setup.c --- devel/arch/sh/boards/dreamcast/setup.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/dreamcast/setup.c 2006-06-02 19:00:19.000000000 -0700 @@ -70,7 +70,7 @@ int __init platform_setup(void) /* Assign all virtual IRQs to the System ASIC int. handler */ for (i = HW_EVENT_IRQ_BASE; i < HW_EVENT_IRQ_MAX; i++) - irq_desc[i].handler = &systemasic_int; + irq_desc[i].chip = &systemasic_int; board_time_init = aica_time_init; diff -puN arch/sh/boards/ec3104/setup.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/ec3104/setup.c --- devel/arch/sh/boards/ec3104/setup.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/ec3104/setup.c 2006-06-02 19:00:19.000000000 -0700 @@ -63,7 +63,7 @@ int __init platform_setup(void) str[i] = ctrl_readb(EC3104_BASE + i); for (i = EC3104_IRQBASE; i < EC3104_IRQBASE + 32; i++) - irq_desc[i].handler = &ec3104_int; + irq_desc[i].chip = &ec3104_int; printk("initializing EC3104 \"%.8s\" at %08x, IRQ %d, IRQ base %d\n", str, EC3104_BASE, EC3104_IRQ, EC3104_IRQBASE); diff -puN arch/sh/boards/harp/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/harp/irq.c --- devel/arch/sh/boards/harp/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/harp/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -114,7 +114,7 @@ static void enable_harp_irq(unsigned int static void __init make_harp_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &harp_irq_type; + irq_desc[irq].chip = &harp_irq_type; disable_harp_irq(irq); } diff -puN arch/sh/boards/mpc1211/setup.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/mpc1211/setup.c --- devel/arch/sh/boards/mpc1211/setup.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/mpc1211/setup.c 2006-06-02 19:00:19.000000000 -0700 @@ -194,7 +194,7 @@ static struct hw_interrupt_type mpc1211_ static void make_mpc1211_irq(unsigned int irq) { - irq_desc[irq].handler = &mpc1211_irq_type; + irq_desc[irq].chip = &mpc1211_irq_type; irq_desc[irq].status = IRQ_DISABLED; irq_desc[irq].action = 0; irq_desc[irq].depth = 1; diff -puN arch/sh/boards/overdrive/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/overdrive/irq.c --- devel/arch/sh/boards/overdrive/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/overdrive/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -150,7 +150,7 @@ static void enable_od_irq(unsigned int i static void __init make_od_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &od_irq_type; + irq_desc[irq].chip = &od_irq_type; disable_od_irq(irq); } diff -puN arch/sh/boards/renesas/hs7751rvoip/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/renesas/hs7751rvoip/irq.c --- devel/arch/sh/boards/renesas/hs7751rvoip/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/renesas/hs7751rvoip/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -86,7 +86,7 @@ static struct hw_interrupt_type hs7751rv static void make_hs7751rvoip_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &hs7751rvoip_irq_type; + irq_desc[irq].chip = &hs7751rvoip_irq_type; disable_hs7751rvoip_irq(irq); } diff -puN arch/sh/boards/renesas/rts7751r2d/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/renesas/rts7751r2d/irq.c --- devel/arch/sh/boards/renesas/rts7751r2d/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/renesas/rts7751r2d/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -100,7 +100,7 @@ static struct hw_interrupt_type rts7751r static void make_rts7751r2d_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &rts7751r2d_irq_type; + irq_desc[irq].chip = &rts7751r2d_irq_type; disable_rts7751r2d_irq(irq); } diff -puN arch/sh/boards/renesas/systemh/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/renesas/systemh/irq.c --- devel/arch/sh/boards/renesas/systemh/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/renesas/systemh/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -105,7 +105,7 @@ static void end_systemh_irq(unsigned int void make_systemh_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &systemh_irq_type; + irq_desc[irq].chip = &systemh_irq_type; disable_systemh_irq(irq); } diff -puN arch/sh/boards/se/73180/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/se/73180/irq.c --- devel/arch/sh/boards/se/73180/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/se/73180/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -85,7 +85,7 @@ void make_intreq_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &intreq_irq_type; + irq_desc[irq].chip = &intreq_irq_type; disable_intreq_irq(irq); } diff -puN arch/sh/boards/superh/microdev/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/boards/superh/microdev/irq.c --- devel/arch/sh/boards/superh/microdev/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/boards/superh/microdev/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -147,7 +147,7 @@ static void enable_microdev_irq(unsigned static void __init make_microdev_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = µdev_irq_type; + irq_desc[irq].chip = µdev_irq_type; disable_microdev_irq(irq); } diff -puN arch/sh/cchips/hd6446x/hd64461/setup.c~genirq-rename-desc-handler-to-desc-chip arch/sh/cchips/hd6446x/hd64461/setup.c --- devel/arch/sh/cchips/hd6446x/hd64461/setup.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/cchips/hd6446x/hd64461/setup.c 2006-06-02 19:00:19.000000000 -0700 @@ -154,7 +154,7 @@ int __init setup_hd64461(void) outw(0xffff, HD64461_NIMR); for (i = HD64461_IRQBASE; i < HD64461_IRQBASE + 16; i++) { - irq_desc[i].handler = &hd64461_irq_type; + irq_desc[i].chip = &hd64461_irq_type; } setup_irq(CONFIG_HD64461_IRQ, &irq0); diff -puN arch/sh/cchips/hd6446x/hd64465/setup.c~genirq-rename-desc-handler-to-desc-chip arch/sh/cchips/hd6446x/hd64465/setup.c --- devel/arch/sh/cchips/hd6446x/hd64465/setup.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/cchips/hd6446x/hd64465/setup.c 2006-06-02 19:00:19.000000000 -0700 @@ -182,7 +182,7 @@ static int __init setup_hd64465(void) outw(0xffff, HD64465_REG_NIMR); /* mask all interrupts */ for (i = 0; i < HD64465_IRQ_NUM ; i++) { - irq_desc[HD64465_IRQ_BASE + i].handler = &hd64465_irq_type; + irq_desc[HD64465_IRQ_BASE + i].chip = &hd64465_irq_type; } setup_irq(CONFIG_HD64465_IRQ, &irq0); diff -puN arch/sh/cchips/voyagergx/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/cchips/voyagergx/irq.c --- devel/arch/sh/cchips/voyagergx/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/cchips/voyagergx/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -191,7 +191,7 @@ void __init setup_voyagergx_irq(void) flag = 1; } if (flag == 1) - irq_desc[VOYAGER_IRQ_BASE + i].handler = &voyagergx_irq_type; + irq_desc[VOYAGER_IRQ_BASE + i].chip = &voyagergx_irq_type; } setup_irq(IRQ_VOYAGER, &irq0); diff -puN arch/sh/kernel/cpu/irq/imask.c~genirq-rename-desc-handler-to-desc-chip arch/sh/kernel/cpu/irq/imask.c --- devel/arch/sh/kernel/cpu/irq/imask.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/kernel/cpu/irq/imask.c 2006-06-02 19:00:19.000000000 -0700 @@ -105,6 +105,6 @@ static void shutdown_imask_irq(unsigned void make_imask_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &imask_irq_type; + irq_desc[irq].chip = &imask_irq_type; enable_irq(irq); } diff -puN arch/sh/kernel/cpu/irq/intc2.c~genirq-rename-desc-handler-to-desc-chip arch/sh/kernel/cpu/irq/intc2.c --- devel/arch/sh/kernel/cpu/irq/intc2.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/kernel/cpu/irq/intc2.c 2006-06-02 19:00:19.000000000 -0700 @@ -137,7 +137,7 @@ void make_intc2_irq(unsigned int irq, local_irq_restore(flags); - irq_desc[irq].handler = &intc2_irq_type; + irq_desc[irq].chip = &intc2_irq_type; disable_intc2_irq(irq); } diff -puN arch/sh/kernel/cpu/irq/ipr.c~genirq-rename-desc-handler-to-desc-chip arch/sh/kernel/cpu/irq/ipr.c --- devel/arch/sh/kernel/cpu/irq/ipr.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/kernel/cpu/irq/ipr.c 2006-06-02 19:00:19.000000000 -0700 @@ -115,7 +115,7 @@ void make_ipr_irq(unsigned int irq, unsi ipr_data[irq].shift = pos*4; /* POSition (0-3) x 4 means shift */ ipr_data[irq].priority = priority; - irq_desc[irq].handler = &ipr_irq_type; + irq_desc[irq].chip = &ipr_irq_type; disable_ipr_irq(irq); } diff -puN arch/sh/kernel/cpu/irq/pint.c~genirq-rename-desc-handler-to-desc-chip arch/sh/kernel/cpu/irq/pint.c --- devel/arch/sh/kernel/cpu/irq/pint.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/kernel/cpu/irq/pint.c 2006-06-02 19:00:19.000000000 -0700 @@ -85,7 +85,7 @@ static void end_pint_irq(unsigned int ir void make_pint_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &pint_irq_type; + irq_desc[irq].chip = &pint_irq_type; disable_pint_irq(irq); } diff -puN arch/sh/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/sh/kernel/irq.c --- devel/arch/sh/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/sh/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -47,7 +47,7 @@ int show_interrupts(struct seq_file *p, goto unlock; seq_printf(p, "%3d: ",i); seq_printf(p, "%10u ", kstat_irqs(i)); - seq_printf(p, " %14s", irq_desc[i].handler->typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) diff -puN arch/um/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/um/kernel/irq.c --- devel/arch/um/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/um/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -63,7 +63,7 @@ int show_interrupts(struct seq_file *p, for_each_online_cpu(j) seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); #endif - seq_printf(p, " %14s", irq_desc[i].handler->typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) @@ -451,13 +451,13 @@ void __init init_IRQ(void) irq_desc[TIMER_IRQ].status = IRQ_DISABLED; irq_desc[TIMER_IRQ].action = NULL; irq_desc[TIMER_IRQ].depth = 1; - irq_desc[TIMER_IRQ].handler = &SIGVTALRM_irq_type; + irq_desc[TIMER_IRQ].chip = &SIGVTALRM_irq_type; enable_irq(TIMER_IRQ); for (i = 1; i < NR_IRQS; i++) { irq_desc[i].status = IRQ_DISABLED; irq_desc[i].action = NULL; irq_desc[i].depth = 1; - irq_desc[i].handler = &normal_irq_type; + irq_desc[i].chip = &normal_irq_type; enable_irq(i); } } diff -puN arch/v850/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/v850/kernel/irq.c --- devel/arch/v850/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/v850/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -65,10 +65,10 @@ int show_interrupts(struct seq_file *p, int j; int count = 0; int num = -1; - const char *type_name = irq_desc[irq].handler->typename; + const char *type_name = irq_desc[irq].chip->typename; for (j = 0; j < NR_IRQS; j++) - if (irq_desc[j].handler->typename == type_name){ + if (irq_desc[j].chip->typename == type_name){ if (irq == j) num = count; count++; @@ -117,7 +117,7 @@ init_irq_handlers (int base_irq, int num irq_desc[base_irq].status = IRQ_DISABLED; irq_desc[base_irq].action = NULL; irq_desc[base_irq].depth = 1; - irq_desc[base_irq].handler = irq_type; + irq_desc[base_irq].chip = irq_type; base_irq += interval; } } diff -puN arch/x86_64/kernel/i8259.c~genirq-rename-desc-handler-to-desc-chip arch/x86_64/kernel/i8259.c --- devel/arch/x86_64/kernel/i8259.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/x86_64/kernel/i8259.c 2006-06-02 19:00:19.000000000 -0700 @@ -235,7 +235,7 @@ void make_8259A_irq(unsigned int irq) { disable_irq_nosync(irq); io_apic_irqs &= ~(1<typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) @@ -119,8 +119,8 @@ void fixup_irqs(cpumask_t map) printk("Breaking affinity for irq %i\n", irq); mask = map; } - if (irq_desc[irq].handler->set_affinity) - irq_desc[irq].handler->set_affinity(irq, mask); + if (irq_desc[irq].chip->set_affinity) + irq_desc[irq].chip->set_affinity(irq, mask); else if (irq_desc[irq].action && !(warned++)) printk("Cannot set affinity for irq %i\n", irq); } diff -puN arch/xtensa/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip arch/xtensa/kernel/irq.c --- devel/arch/xtensa/kernel/irq.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/arch/xtensa/kernel/irq.c 2006-06-02 19:00:19.000000000 -0700 @@ -100,7 +100,7 @@ int show_interrupts(struct seq_file *p, for_each_online_cpu(j) seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); #endif - seq_printf(p, " %14s", irq_desc[i].handler->typename); + seq_printf(p, " %14s", irq_desc[i].chip->typename); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) @@ -181,7 +181,7 @@ void __init init_IRQ(void) int i; for (i=0; i < XTENSA_NR_IRQS; i++) - irq_desc[i].handler = &xtensa_irq_type; + irq_desc[i].chip = &xtensa_irq_type; cached_irq_mask = 0; diff -puN drivers/char/vr41xx_giu.c~genirq-rename-desc-handler-to-desc-chip drivers/char/vr41xx_giu.c --- devel/drivers/char/vr41xx_giu.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/drivers/char/vr41xx_giu.c 2006-06-02 19:00:19.000000000 -0700 @@ -689,9 +689,9 @@ static int __devinit giu_probe(struct pl for (i = GIU_IRQ_BASE; i <= GIU_IRQ_LAST; i++) { if (i < GIU_IRQ(GIUINT_HIGH_OFFSET)) - irq_desc[i].handler = &giuint_low_irq_type; + irq_desc[i].chip = &giuint_low_irq_type; else - irq_desc[i].handler = &giuint_high_irq_type; + irq_desc[i].chip = &giuint_high_irq_type; } return cascade_irq(GIUINT_IRQ, giu_get_irq); diff -puN drivers/parisc/dino.c~genirq-rename-desc-handler-to-desc-chip drivers/parisc/dino.c --- devel/drivers/parisc/dino.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/drivers/parisc/dino.c 2006-06-02 19:00:19.000000000 -0700 @@ -299,7 +299,7 @@ struct pci_port_ops dino_port_ops = { static void dino_disable_irq(unsigned int irq) { - struct dino_device *dino_dev = irq_desc[irq].handler_data; + struct dino_device *dino_dev = irq_desc[irq].chip_data; int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq); @@ -311,7 +311,7 @@ static void dino_disable_irq(unsigned in static void dino_enable_irq(unsigned int irq) { - struct dino_device *dino_dev = irq_desc[irq].handler_data; + struct dino_device *dino_dev = irq_desc[irq].chip_data; int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); u32 tmp; diff -puN drivers/parisc/eisa.c~genirq-rename-desc-handler-to-desc-chip drivers/parisc/eisa.c --- devel/drivers/parisc/eisa.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/drivers/parisc/eisa.c 2006-06-02 19:00:19.000000000 -0700 @@ -350,7 +350,7 @@ static int __devinit eisa_probe(struct p irq_desc[2].action = &irq2_action; for (i = 0; i < 16; i++) { - irq_desc[i].handler = &eisa_interrupt_type; + irq_desc[i].chip = &eisa_interrupt_type; } EISA_bus = 1; diff -puN drivers/parisc/gsc.c~genirq-rename-desc-handler-to-desc-chip drivers/parisc/gsc.c --- devel/drivers/parisc/gsc.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/drivers/parisc/gsc.c 2006-06-02 19:00:19.000000000 -0700 @@ -109,7 +109,7 @@ int gsc_find_local_irq(unsigned int irq, static void gsc_asic_disable_irq(unsigned int irq) { - struct gsc_asic *irq_dev = irq_desc[irq].handler_data; + struct gsc_asic *irq_dev = irq_desc[irq].chip_data; int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32); u32 imr; @@ -124,7 +124,7 @@ static void gsc_asic_disable_irq(unsigne static void gsc_asic_enable_irq(unsigned int irq) { - struct gsc_asic *irq_dev = irq_desc[irq].handler_data; + struct gsc_asic *irq_dev = irq_desc[irq].chip_data; int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32); u32 imr; @@ -164,8 +164,8 @@ int gsc_assign_irq(struct hw_interrupt_t if (irq > GSC_IRQ_MAX) return NO_IRQ; - irq_desc[irq].handler = type; - irq_desc[irq].handler_data = data; + irq_desc[irq].chip = type; + irq_desc[irq].chip_data = data; return irq++; } diff -puN drivers/parisc/iosapic.c~genirq-rename-desc-handler-to-desc-chip drivers/parisc/iosapic.c --- devel/drivers/parisc/iosapic.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/drivers/parisc/iosapic.c 2006-06-02 19:00:19.000000000 -0700 @@ -619,7 +619,7 @@ iosapic_set_irt_data( struct vector_info static struct vector_info *iosapic_get_vector(unsigned int irq) { - return irq_desc[irq].handler_data; + return irq_desc[irq].chip_data; } static void iosapic_disable_irq(unsigned int irq) diff -puN drivers/parisc/superio.c~genirq-rename-desc-handler-to-desc-chip drivers/parisc/superio.c --- devel/drivers/parisc/superio.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/drivers/parisc/superio.c 2006-06-02 19:00:19.000000000 -0700 @@ -360,7 +360,7 @@ int superio_fixup_irq(struct pci_dev *pc #endif for (i = 0; i < 16; i++) { - irq_desc[i].handler = &superio_interrupt_type; + irq_desc[i].chip = &superio_interrupt_type; } /* diff -puN drivers/pci/msi.c~genirq-rename-desc-handler-to-desc-chip drivers/pci/msi.c --- devel/drivers/pci/msi.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/drivers/pci/msi.c 2006-06-02 19:00:19.000000000 -0700 @@ -429,12 +429,12 @@ static void irq_handler_init(int cap_id, spin_lock_irqsave(&irq_desc[pos].lock, flags); if (cap_id == PCI_CAP_ID_MSIX) - irq_desc[pos].handler = &msix_irq_type; + irq_desc[pos].chip = &msix_irq_type; else { if (!mask) - irq_desc[pos].handler = &msi_irq_wo_maskbit_type; + irq_desc[pos].chip = &msi_irq_wo_maskbit_type; else - irq_desc[pos].handler = &msi_irq_w_maskbit_type; + irq_desc[pos].chip = &msi_irq_w_maskbit_type; } spin_unlock_irqrestore(&irq_desc[pos].lock, flags); } diff -puN drivers/pcmcia/hd64465_ss.c~genirq-rename-desc-handler-to-desc-chip drivers/pcmcia/hd64465_ss.c --- devel/drivers/pcmcia/hd64465_ss.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/drivers/pcmcia/hd64465_ss.c 2006-06-02 19:00:19.000000000 -0700 @@ -244,8 +244,8 @@ static void hs_map_irq(hs_socket_t *sp, hs_mapped_irq[irq].sock = sp; /* insert ourselves as the irq controller */ - hs_mapped_irq[irq].old_handler = irq_desc[irq].handler; - irq_desc[irq].handler = &hd64465_ss_irq_type; + hs_mapped_irq[irq].old_handler = irq_desc[irq].chip; + irq_desc[irq].chip = &hd64465_ss_irq_type; } @@ -260,7 +260,7 @@ static void hs_unmap_irq(hs_socket_t *sp return; /* restore the original irq controller */ - irq_desc[irq].handler = hs_mapped_irq[irq].old_handler; + irq_desc[irq].chip = hs_mapped_irq[irq].old_handler; } /*============================================================*/ diff -puN include/asm-powerpc/hw_irq.h~genirq-rename-desc-handler-to-desc-chip include/asm-powerpc/hw_irq.h --- devel/include/asm-powerpc/hw_irq.h~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/include/asm-powerpc/hw_irq.h 2006-06-02 19:00:19.000000000 -0700 @@ -86,20 +86,20 @@ static inline void local_irq_save_ptr(un #define mask_irq(irq) \ ({ \ irq_desc_t *desc = get_irq_desc(irq); \ - if (desc->handler && desc->handler->disable) \ - desc->handler->disable(irq); \ + if (desc->chip && desc->chip->disable) \ + desc->chip->disable(irq); \ }) #define unmask_irq(irq) \ ({ \ irq_desc_t *desc = get_irq_desc(irq); \ - if (desc->handler && desc->handler->enable) \ - desc->handler->enable(irq); \ + if (desc->chip && desc->chip->enable) \ + desc->chip->enable(irq); \ }) #define ack_irq(irq) \ ({ \ irq_desc_t *desc = get_irq_desc(irq); \ - if (desc->handler && desc->handler->ack) \ - desc->handler->ack(irq); \ + if (desc->chip && desc->chip->ack) \ + desc->chip->ack(irq); \ }) /* Should we handle this via lost interrupts and IPIs or should we don't care like diff -puN include/linux/irq.h~genirq-rename-desc-handler-to-desc-chip include/linux/irq.h --- devel/include/linux/irq.h~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/include/linux/irq.h 2006-06-02 19:00:19.000000000 -0700 @@ -69,8 +69,8 @@ typedef struct hw_interrupt_type hw_irq * Pad this out to 32 bytes for cache and indexing reasons. */ typedef struct irq_desc { - hw_irq_controller *handler; - void *handler_data; + hw_irq_controller *chip; + void *chip_data; struct irqaction *action; /* IRQ action list */ unsigned int status; /* IRQ status */ unsigned int depth; /* nested irq disables */ diff -puN kernel/irq/autoprobe.c~genirq-rename-desc-handler-to-desc-chip kernel/irq/autoprobe.c --- devel/kernel/irq/autoprobe.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/kernel/irq/autoprobe.c 2006-06-02 19:00:19.000000000 -0700 @@ -41,7 +41,7 @@ unsigned long probe_irq_on(void) spin_lock_irq(&desc->lock); if (!irq_desc[i].action) - irq_desc[i].handler->startup(i); + irq_desc[i].chip->startup(i); spin_unlock_irq(&desc->lock); } @@ -59,7 +59,7 @@ unsigned long probe_irq_on(void) spin_lock_irq(&desc->lock); if (!desc->action) { desc->status |= IRQ_AUTODETECT | IRQ_WAITING; - if (desc->handler->startup(i)) + if (desc->chip->startup(i)) desc->status |= IRQ_PENDING; } spin_unlock_irq(&desc->lock); @@ -85,7 +85,7 @@ unsigned long probe_irq_on(void) /* It triggered already - consider it spurious. */ if (!(status & IRQ_WAITING)) { desc->status = status & ~IRQ_AUTODETECT; - desc->handler->shutdown(i); + desc->chip->shutdown(i); } else if (i < 32) val |= 1 << i; @@ -128,7 +128,7 @@ unsigned int probe_irq_mask(unsigned lon mask |= 1 << i; desc->status = status & ~IRQ_AUTODETECT; - desc->handler->shutdown(i); + desc->chip->shutdown(i); } spin_unlock_irq(&desc->lock); } @@ -173,7 +173,7 @@ int probe_irq_off(unsigned long val) nr_irqs++; } desc->status = status & ~IRQ_AUTODETECT; - desc->handler->shutdown(i); + desc->chip->shutdown(i); } spin_unlock_irq(&desc->lock); } diff -puN kernel/irq/handle.c~genirq-rename-desc-handler-to-desc-chip kernel/irq/handle.c --- devel/kernel/irq/handle.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/kernel/irq/handle.c 2006-06-02 19:00:19.000000000 -0700 @@ -31,7 +31,7 @@ irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = { [0 ... NR_IRQS-1] = { .status = IRQ_DISABLED, - .handler = &no_irq_type, + .chip = &no_irq_type, .lock = SPIN_LOCK_UNLOCKED } }; @@ -118,16 +118,16 @@ fastcall unsigned int __do_IRQ(unsigned /* * No locking required for CPU-local interrupts: */ - if (desc->handler->ack) - desc->handler->ack(irq); + if (desc->chip->ack) + desc->chip->ack(irq); action_ret = handle_IRQ_event(irq, regs, desc->action); - desc->handler->end(irq); + desc->chip->end(irq); return 1; } spin_lock(&desc->lock); - if (desc->handler->ack) - desc->handler->ack(irq); + if (desc->chip->ack) + desc->chip->ack(irq); /* * REPLAY is when Linux resends an IRQ that was dropped earlier * WAITING is used by probe to mark irqs that are being tested @@ -187,7 +187,7 @@ out: * The ->end() handler has to deal with interrupts which got * disabled while the handler was running. */ - desc->handler->end(irq); + desc->chip->end(irq); spin_unlock(&desc->lock); return 1; diff -puN kernel/irq/manage.c~genirq-rename-desc-handler-to-desc-chip kernel/irq/manage.c --- devel/kernel/irq/manage.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/kernel/irq/manage.c 2006-06-02 19:00:19.000000000 -0700 @@ -69,7 +69,7 @@ void disable_irq_nosync(unsigned int irq spin_lock_irqsave(&desc->lock, flags); if (!desc->depth++) { desc->status |= IRQ_DISABLED; - desc->handler->disable(irq); + desc->chip->disable(irq); } spin_unlock_irqrestore(&desc->lock, flags); } @@ -131,9 +131,9 @@ void enable_irq(unsigned int irq) desc->status = status; if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { desc->status = status | IRQ_REPLAY; - hw_resend_irq(desc->handler,irq); + hw_resend_irq(desc->chip,irq); } - desc->handler->enable(irq); + desc->chip->enable(irq); /* fall-through */ } default: @@ -178,7 +178,7 @@ int setup_irq(unsigned int irq, struct i if (irq >= NR_IRQS) return -EINVAL; - if (desc->handler == &no_irq_type) + if (desc->chip == &no_irq_type) return -ENOSYS; /* * Some drivers like serial.c use request_irq() heavily, @@ -230,10 +230,10 @@ int setup_irq(unsigned int irq, struct i desc->depth = 0; desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING | IRQ_INPROGRESS); - if (desc->handler->startup) - desc->handler->startup(irq); + if (desc->chip->startup) + desc->chip->startup(irq); else - desc->handler->enable(irq); + desc->chip->enable(irq); } spin_unlock_irqrestore(&desc->lock,flags); @@ -295,16 +295,16 @@ void free_irq(unsigned int irq, void *de /* Currently used only by UML, might disappear one day.*/ #ifdef CONFIG_IRQ_RELEASE_METHOD - if (desc->handler->release) - desc->handler->release(irq, dev_id); + if (desc->chip->release) + desc->chip->release(irq, dev_id); #endif if (!desc->action) { desc->status |= IRQ_DISABLED; - if (desc->handler->shutdown) - desc->handler->shutdown(irq); + if (desc->chip->shutdown) + desc->chip->shutdown(irq); else - desc->handler->disable(irq); + desc->chip->disable(irq); } spin_unlock_irqrestore(&desc->lock,flags); unregister_handler_proc(irq, action); diff -puN kernel/irq/migration.c~genirq-rename-desc-handler-to-desc-chip kernel/irq/migration.c --- devel/kernel/irq/migration.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/kernel/irq/migration.c 2006-06-02 19:00:19.000000000 -0700 @@ -33,7 +33,7 @@ void move_native_irq(int irq) if (unlikely(cpus_empty(pending_irq_cpumask[irq]))) return; - if (!desc->handler->set_affinity) + if (!desc->chip->set_affinity) return; assert_spin_locked(&desc->lock); @@ -51,12 +51,12 @@ void move_native_irq(int irq) */ if (likely(!cpus_empty(tmp))) { if (likely(!(desc->status & IRQ_DISABLED))) - desc->handler->disable(irq); + desc->chip->disable(irq); - desc->handler->set_affinity(irq,tmp); + desc->chip->set_affinity(irq,tmp); if (likely(!(desc->status & IRQ_DISABLED))) - desc->handler->enable(irq); + desc->chip->enable(irq); } cpus_clear(pending_irq_cpumask[irq]); } diff -puN kernel/irq/proc.c~genirq-rename-desc-handler-to-desc-chip kernel/irq/proc.c --- devel/kernel/irq/proc.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/kernel/irq/proc.c 2006-06-02 19:00:19.000000000 -0700 @@ -37,7 +37,7 @@ void proc_set_irq_affinity(unsigned int { set_balance_irq_affinity(irq, mask_val); irq_affinity[irq] = mask_val; - irq_desc[irq].handler->set_affinity(irq, mask_val); + irq_desc[irq].chip->set_affinity(irq, mask_val); } #endif @@ -59,7 +59,7 @@ static int irq_affinity_write_proc(struc unsigned int irq = (int)(long)data, full_count = count, err; cpumask_t new_value, tmp; - if (!irq_desc[irq].handler->set_affinity || no_irq_affinity) + if (!irq_desc[irq].chip->set_affinity || no_irq_affinity) return -EIO; err = cpumask_parse(buffer, count, new_value); @@ -122,7 +122,7 @@ void register_irq_proc(unsigned int irq) char name [MAX_NAMELEN]; if (!root_irq_dir || - (irq_desc[irq].handler == &no_irq_type) || + (irq_desc[irq].chip == &no_irq_type) || irq_dir[irq]) return; diff -puN kernel/irq/spurious.c~genirq-rename-desc-handler-to-desc-chip kernel/irq/spurious.c --- devel/kernel/irq/spurious.c~genirq-rename-desc-handler-to-desc-chip 2006-06-02 19:00:19.000000000 -0700 +++ devel-akpm/kernel/irq/spurious.c 2006-06-02 19:00:19.000000000 -0700 @@ -81,7 +81,7 @@ static int misrouted_irq(int irq, struct * IRQ controller clean up too */ if(work) - desc->handler->end(i); + desc->chip->end(i); spin_unlock(&desc->lock); } /* So the caller can adjust the irq error counts */ @@ -166,7 +166,7 @@ void note_interrupt(unsigned int irq, ir */ printk(KERN_EMERG "Disabling IRQ #%d\n", irq); desc->status |= IRQ_DISABLED; - desc->handler->disable(irq); + desc->chip->disable(irq); } desc->irqs_unhandled = 0; } _