Skip to content

Commit

Permalink
[IA64] remove obsolete hw_interrupt_type
Browse files Browse the repository at this point in the history
The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) have
been kept around for migration reasons.  After more than two years it's
time to remove them finally.

This patch cleans up one of the remaining users.  When all such patches
hit mainline we can remove the defines and typedefs finally.

Impact: cleanup

Convert the last remaining users to struct irq_chip and remove the
define.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Thomas Gleixner authored and Tony Luck committed Jun 15, 2009
1 parent 86bc3df commit fb824f4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/ia64/hp/sim/hpsim_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ hpsim_set_affinity_noop(unsigned int a, const struct cpumask *b)
return 0;
}

static struct hw_interrupt_type irq_type_hp_sim = {
static struct irq_chip irq_type_hp_sim = {
.name = "hpsim",
.startup = hpsim_irq_startup,
.shutdown = hpsim_irq_noop,
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/include/asm/hw_irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ extern struct irq_cfg irq_cfg[NR_IRQS];
#define irq_to_domain(x) irq_cfg[(x)].domain
DECLARE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq);

extern struct hw_interrupt_type irq_type_ia64_lsapic; /* CPU-internal interrupt controller */
extern struct irq_chip irq_type_ia64_lsapic; /* CPU-internal interrupt controller */

#ifdef CONFIG_PARAVIRT_GUEST
#include <asm/paravirt.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/iosapic.c
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ register_intr (unsigned int gsi, int irq, unsigned char delivery,
unsigned long polarity, unsigned long trigger)
{
struct irq_desc *idesc;
struct hw_interrupt_type *irq_type;
struct irq_chip *irq_type;
int index;
struct iosapic_rte_info *rte;

Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/kernel/irq_lsapic.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static int lsapic_retrigger(unsigned int irq)
return 1;
}

struct hw_interrupt_type irq_type_ia64_lsapic = {
struct irq_chip irq_type_ia64_lsapic = {
.name = "LSAPIC",
.startup = lsapic_noop_startup,
.shutdown = lsapic_noop,
Expand Down

0 comments on commit fb824f4

Please sign in to comment.