From: Ingo Molnar Cleanup: remove irq_descp() - explicit use of irq_desc[] is shorter and more readable. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton --- arch/ia64/hp/sim/hpsim_irq.c | 2 +- arch/ia64/kernel/iosapic.c | 14 +++++++------- arch/ia64/kernel/irq.c | 2 +- arch/ia64/kernel/irq_ia64.c | 2 +- arch/ia64/kernel/machine_kexec.c | 2 +- arch/ia64/kernel/mca.c | 2 +- arch/ia64/kernel/smpboot.c | 2 +- arch/powerpc/kernel/crash.c | 2 +- include/linux/irq.h | 7 ------- kernel/irq/migration.c | 2 +- 10 files changed, 15 insertions(+), 22 deletions(-) diff -puN arch/ia64/hp/sim/hpsim_irq.c~genirq-cleanup-remove-irq_descp arch/ia64/hp/sim/hpsim_irq.c --- devel/arch/ia64/hp/sim/hpsim_irq.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/arch/ia64/hp/sim/hpsim_irq.c 2006-05-22 15:12:23.000000000 -0700 @@ -44,7 +44,7 @@ hpsim_irq_init (void) int i; for (i = 0; i < NR_IRQS; ++i) { - idesc = irq_descp(i); + idesc = irq_desc + i; if (idesc->handler == &no_irq_type) idesc->handler = &irq_type_hp_sim; } diff -puN arch/ia64/kernel/iosapic.c~genirq-cleanup-remove-irq_descp arch/ia64/kernel/iosapic.c --- devel/arch/ia64/kernel/iosapic.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/iosapic.c 2006-05-22 15:12:23.000000000 -0700 @@ -456,7 +456,7 @@ iosapic_startup_edge_irq (unsigned int i static void iosapic_ack_edge_irq (unsigned int irq) { - irq_desc_t *idesc = irq_descp(irq); + irq_desc_t *idesc = irq_desc + irq; move_native_irq(irq); /* @@ -659,7 +659,7 @@ register_intr (unsigned int gsi, int vec else irq_type = &irq_type_iosapic_level; - idesc = irq_descp(vector); + idesc = irq_desc + vector; if (idesc->chip != irq_type) { if (idesc->chip != &no_irq_type) printk(KERN_WARNING @@ -793,14 +793,14 @@ again: return -ENOSPC; } - spin_lock_irqsave(&irq_descp(vector)->lock, flags); + spin_lock_irqsave(&irq_desc[vector].lock, flags); spin_lock(&iosapic_lock); { if (gsi_to_vector(gsi) > 0) { if (list_empty(&iosapic_intr_info[vector].rtes)) free_irq_vector(vector); spin_unlock(&iosapic_lock); - spin_unlock_irqrestore(&irq_descp(vector)->lock, + spin_unlock_irqrestore(&irq_desc[vector].lock, flags); goto again; } @@ -810,7 +810,7 @@ again: polarity, trigger); if (err < 0) { spin_unlock(&iosapic_lock); - spin_unlock_irqrestore(&irq_descp(vector)->lock, + spin_unlock_irqrestore(&irq_desc[vector].lock, flags); return err; } @@ -825,7 +825,7 @@ again: set_rte(gsi, vector, dest, mask); } spin_unlock(&iosapic_lock); - spin_unlock_irqrestore(&irq_descp(vector)->lock, flags); + spin_unlock_irqrestore(&irq_desc[vector].lock, flags); printk(KERN_INFO "GSI %u (%s, %s) -> CPU %d (0x%04x) vector %d\n", gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), @@ -860,7 +860,7 @@ iosapic_unregister_intr (unsigned int gs } vector = irq_to_vector(irq); - idesc = irq_descp(irq); + idesc = irq_desc + irq; spin_lock_irqsave(&idesc->lock, flags); spin_lock(&iosapic_lock); { diff -puN arch/ia64/kernel/irq.c~genirq-cleanup-remove-irq_descp arch/ia64/kernel/irq.c --- devel/arch/ia64/kernel/irq.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/irq.c 2006-05-22 15:12:23.000000000 -0700 @@ -120,7 +120,7 @@ static void migrate_irqs(void) int irq, new_cpu; for (irq=0; irq < NR_IRQS; irq++) { - desc = irq_descp(irq); + desc = irq_desc + irq; /* * No handling for now. diff -puN arch/ia64/kernel/irq_ia64.c~genirq-cleanup-remove-irq_descp arch/ia64/kernel/irq_ia64.c --- devel/arch/ia64/kernel/irq_ia64.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/irq_ia64.c 2006-05-22 15:12:23.000000000 -0700 @@ -249,7 +249,7 @@ register_percpu_irq (ia64_vector vec, st for (irq = 0; irq < NR_IRQS; ++irq) if (irq_to_vector(irq) == vec) { - desc = irq_descp(irq); + desc = irq_desc + irq; desc->status |= IRQ_PER_CPU; desc->chip = &irq_type_ia64_lsapic; if (action) diff -puN arch/ia64/kernel/machine_kexec.c~genirq-cleanup-remove-irq_descp arch/ia64/kernel/machine_kexec.c --- devel/arch/ia64/kernel/machine_kexec.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/machine_kexec.c 2006-05-22 15:12:23.000000000 -0700 @@ -66,7 +66,7 @@ void machine_shutdown(void) while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { if (!(dev->is_enabled)) continue; - idesc = irq_descp(dev->irq); + idesc = irq_desc + dev->irq; if (!idesc) continue; cpu_set(0, mask); diff -puN arch/ia64/kernel/mca.c~genirq-cleanup-remove-irq_descp arch/ia64/kernel/mca.c --- devel/arch/ia64/kernel/mca.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/mca.c 2006-05-22 15:12:23.000000000 -0700 @@ -1788,7 +1788,7 @@ ia64_mca_late_init(void) cpe_poll_enabled = 0; for (irq = 0; irq < NR_IRQS; ++irq) if (irq_to_vector(irq) == cpe_vector) { - desc = irq_descp(irq); + desc = irq_desc + irq; desc->status |= IRQ_PER_CPU; setup_irq(irq, &mca_cpe_irqaction); ia64_cpe_irq = irq; diff -puN arch/ia64/kernel/smpboot.c~genirq-cleanup-remove-irq_descp arch/ia64/kernel/smpboot.c --- devel/arch/ia64/kernel/smpboot.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/arch/ia64/kernel/smpboot.c 2006-05-22 15:12:23.000000000 -0700 @@ -677,7 +677,7 @@ int migrate_platform_irqs(unsigned int c new_cpei_cpu = any_online_cpu(cpu_online_map); mask = cpumask_of_cpu(new_cpei_cpu); set_cpei_target_cpu(new_cpei_cpu); - desc = irq_descp(ia64_cpe_irq); + desc = irq_desc + ia64_cpe_irq; /* * Switch for now, immediatly, we need to do fake intr * as other interrupts, but need to study CPEI behaviour with diff -puN arch/powerpc/kernel/crash.c~genirq-cleanup-remove-irq_descp arch/powerpc/kernel/crash.c --- devel/arch/powerpc/kernel/crash.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/arch/powerpc/kernel/crash.c 2006-05-22 15:12:23.000000000 -0700 @@ -190,7 +190,7 @@ void default_machine_crash_shutdown(stru local_irq_disable(); for_each_irq(irq) { - struct irq_desc *desc = irq_descp(irq); + struct irq_desc *desc = irq_desc + irq; if (desc->status & IRQ_INPROGRESS) desc->chip->end(irq); diff -puN include/linux/irq.h~genirq-cleanup-remove-irq_descp include/linux/irq.h --- devel/include/linux/irq.h~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/include/linux/irq.h 2006-05-22 15:12:23.000000000 -0700 @@ -87,13 +87,6 @@ typedef struct irq_desc { extern irq_desc_t irq_desc [NR_IRQS]; -/* Return a pointer to the irq descriptor for IRQ. */ -static inline irq_desc_t * -irq_descp (int irq) -{ - return irq_desc + irq; -} - #include /* the arch dependent stuff */ extern int setup_irq(unsigned int irq, struct irqaction * new); diff -puN kernel/irq/migration.c~genirq-cleanup-remove-irq_descp kernel/irq/migration.c --- devel/kernel/irq/migration.c~genirq-cleanup-remove-irq_descp 2006-05-22 15:12:23.000000000 -0700 +++ devel-akpm/kernel/irq/migration.c 2006-05-22 15:12:23.000000000 -0700 @@ -15,7 +15,7 @@ void set_pending_irq(unsigned int irq, c void move_native_irq(int irq) { cpumask_t tmp; - irq_desc_t *desc = irq_descp(irq); + irq_desc_t *desc = irq_desc + irq; if (likely(!desc->move_irq)) return; _