From 34ffdb7233d5847808d2b63ca6761dac3af9c942 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 29 Jun 2006 02:24:40 -0700 Subject: [PATCH] [PATCH] genirq: cleanup: reduce irq_desc_t use, mark it obsolete Cleanup: remove irq_desc_t use from the generic IRQ code, and mark it obsolete. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/linux/irq.h | 18 +++++++++++++----- kernel/irq/autoprobe.c | 6 +++--- kernel/irq/handle.c | 4 ++-- kernel/irq/manage.c | 6 +++--- kernel/irq/migration.c | 4 ++-- kernel/irq/spurious.c | 9 +++++---- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/include/linux/irq.h b/include/linux/irq.h index 92c685414622..9ce276a2374a 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -68,7 +68,7 @@ typedef struct hw_interrupt_type hw_irq_controller; * * Pad this out to 32 bytes for cache and indexing reasons. */ -typedef struct irq_desc { +struct irq_desc { hw_irq_controller *chip; void *chip_data; struct irqaction *action; /* IRQ action list */ @@ -83,11 +83,19 @@ typedef struct irq_desc { #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE) unsigned int move_irq; /* Flag need to re-target intr dest*/ #endif -} ____cacheline_aligned irq_desc_t; +} ____cacheline_aligned; -extern irq_desc_t irq_desc [NR_IRQS]; +extern struct irq_desc irq_desc[NR_IRQS]; -#include /* the arch dependent stuff */ +/* + * Migration helpers for obsolete names, they will go away: + */ +typedef struct irq_desc irq_desc_t; + +/* + * Pick up the arch-dependent methods: + */ +#include extern int setup_irq(unsigned int irq, struct irqaction *new); @@ -188,7 +196,7 @@ extern irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, */ extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs); -extern void note_interrupt(unsigned int irq, irq_desc_t *desc, +extern void note_interrupt(unsigned int irq, struct irq_desc *desc, int action_ret, struct pt_regs *regs); extern int can_request_irq(unsigned int irq, unsigned long irqflags); diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index d6eab98a3173..5c988bba401f 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c @@ -27,8 +27,8 @@ static DEFINE_MUTEX(probing_active); */ unsigned long probe_irq_on(void) { + struct irq_desc *desc; unsigned long mask; - irq_desc_t *desc; unsigned int i; mutex_lock(&probing_active); @@ -116,7 +116,7 @@ unsigned int probe_irq_mask(unsigned long val) mask = 0; for (i = 0; i < NR_IRQS; i++) { - irq_desc_t *desc = irq_desc + i; + struct irq_desc *desc = irq_desc + i; unsigned int status; spin_lock_irq(&desc->lock); @@ -159,7 +159,7 @@ int probe_irq_off(unsigned long val) int i, irq_found = 0, nr_irqs = 0; for (i = 0; i < NR_IRQS; i++) { - irq_desc_t *desc = irq_desc + i; + struct irq_desc *desc = irq_desc + i; unsigned int status; spin_lock_irq(&desc->lock); diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index f9c33a86cbdf..8eda1005d10a 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -28,7 +28,7 @@ * * Controller mappings for all interrupt sources: */ -irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = { +struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = { [0 ... NR_IRQS-1] = { .status = IRQ_DISABLED, .chip = &no_irq_type, @@ -110,7 +110,7 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, */ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs) { - irq_desc_t *desc = irq_desc + irq; + struct irq_desc *desc = irq_desc + irq; struct irqaction *action; unsigned int status; diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 261906ebdf04..6a6f1d3dd399 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -57,7 +57,7 @@ EXPORT_SYMBOL(synchronize_irq); */ void disable_irq_nosync(unsigned int irq) { - irq_desc_t *desc = irq_desc + irq; + struct irq_desc *desc = irq_desc + irq; unsigned long flags; if (irq >= NR_IRQS) @@ -86,7 +86,7 @@ EXPORT_SYMBOL(disable_irq_nosync); */ void disable_irq(unsigned int irq) { - irq_desc_t *desc = irq_desc + irq; + struct irq_desc *desc = irq_desc + irq; if (irq >= NR_IRQS) return; @@ -109,7 +109,7 @@ EXPORT_SYMBOL(disable_irq); */ void enable_irq(unsigned int irq) { - irq_desc_t *desc = irq_desc + irq; + struct irq_desc *desc = irq_desc + irq; unsigned long flags; if (irq >= NR_IRQS) diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index b4a4354d03d5..a571c3abb793 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c @@ -3,7 +3,7 @@ void set_pending_irq(unsigned int irq, cpumask_t mask) { - irq_desc_t *desc = irq_desc + irq; + struct irq_desc *desc = irq_desc + irq; unsigned long flags; spin_lock_irqsave(&desc->lock, flags); @@ -14,8 +14,8 @@ void set_pending_irq(unsigned int irq, cpumask_t mask) void move_native_irq(int irq) { + struct irq_desc *desc = irq_desc + irq; cpumask_t tmp; - irq_desc_t *desc = irq_desc + irq; if (likely(!desc->move_irq)) return; diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 5eae7bf3c347..3a0a62123301 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c @@ -99,7 +99,8 @@ static int misrouted_irq(int irq, struct pt_regs *regs) */ static void -__report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret) +__report_bad_irq(unsigned int irq, struct irq_desc *desc, + irqreturn_t action_ret) { struct irqaction *action; @@ -124,7 +125,7 @@ __report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret) } static void -report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret) +report_bad_irq(unsigned int irq, struct irq_desc *desc, irqreturn_t action_ret) { static int count = 100; @@ -134,8 +135,8 @@ report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret) } } -void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret, - struct pt_regs *regs) +void note_interrupt(unsigned int irq, struct irq_desc *desc, + irqreturn_t action_ret, struct pt_regs *regs) { if (unlikely(action_ret != IRQ_HANDLED)) { desc->irqs_unhandled++; -- 2.20.1