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

Commit 44377f62 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

alpha: remove obsolete hw_interrupt_type 



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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Richard Henderson <rth@twiddle.net>

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee993b13

arch/alpha/kernel/irq_alpha.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ struct irqaction timer_irqaction = { 
	.name		= "timer",

};



static struct hw_interrupt_type rtc_irq_type = {

static struct irq_chip rtc_irq_type = {

	.typename	= "RTC",

	.startup	= rtc_startup,

	.shutdown	= rtc_enable_disable,

arch/alpha/kernel/irq_i8259.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ i8259a_end_irq(unsigned int irq) 
		i8259a_enable_irq(irq);

}



struct hw_interrupt_type i8259a_irq_type = {

struct irq_chip i8259a_irq_type = {

	.typename	= "XT-PIC",

	.startup	= i8259a_startup_irq,

	.shutdown	= i8259a_disable_irq,

arch/alpha/kernel/irq_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ extern void i8259a_disable_irq(unsigned int); 
extern void i8259a_mask_and_ack_irq(unsigned int);

extern unsigned int i8259a_startup_irq(unsigned int);

extern void i8259a_end_irq(unsigned int);

extern struct hw_interrupt_type i8259a_irq_type;

extern struct irq_chip i8259a_irq_type;

extern void init_i8259a_irqs(void);



extern void handle_irq(int irq);

arch/alpha/kernel/irq_pyxis.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ pyxis_mask_and_ack_irq(unsigned int irq) 
	*(vulp)PYXIS_INT_MASK;

}



static struct hw_interrupt_type pyxis_irq_type = {

static struct irq_chip pyxis_irq_type = {

	.typename	= "PYXIS",

	.startup	= pyxis_startup_irq,

	.shutdown	= pyxis_disable_irq,

arch/alpha/kernel/irq_srm.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ srm_end_irq(unsigned int irq) 
}



/* Handle interrupts from the SRM, assuming no additional weirdness.  */

static struct hw_interrupt_type srm_irq_type = {

static struct irq_chip srm_irq_type = {

	.typename	= "SRM",

	.startup	= srm_startup_irq,

	.shutdown	= srm_disable_irq,