Commit 82c849eb authored by afzal mohammed's avatar afzal mohammed Committed by Thomas Gleixner
Browse files

alpha: Replace setup_irq() by request_irq() 



request_irq() is preferred over setup_irq(). Invocations of setup_irq()
occur after memory allocators are ready.

setup_irq() was required in older kernels as the memory allocator was not
available during early boot.

Hence replace setup_irq() by request_irq().

Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarMatt Turner <mattst88@gmail.com>
Link: https://lkml.kernel.org/r/51f8ae7da9f47a23596388141933efa2bdef317b.1585320721.git.afzal.mohd.ma@gmail.com
parent 17e5888e

arch/alpha/kernel/irq_alpha.c

+5 −24
Original line number Diff line number Diff line
@@ -213,32 +213,13 @@ process_mcheck_info(unsigned long vector, unsigned long la_ptr, 
 * The special RTC interrupt type.  The interrupt itself was

 * processed by PALcode, and comes in via entInt vector 1.

 */



struct irqaction timer_irqaction = {

	.handler	= rtc_timer_interrupt,

	.name		= "timer",

};



void __init

init_rtc_irq(void)

init_rtc_irq(irq_handler_t handler)

{

	irq_set_chip_and_handler_name(RTC_IRQ, &dummy_irq_chip,

				      handle_percpu_irq, "RTC");

	setup_irq(RTC_IRQ, &timer_irqaction);

	if (!handler)

		handler = rtc_timer_interrupt;

	if (request_irq(RTC_IRQ, handler, 0, "timer", NULL))

		pr_err("Failed to register timer interrupt\n");

}
 


/* Dummy irqactions.  */

struct irqaction isa_cascade_irqaction = {

	.handler	= no_action,

	.name		= "isa-cascade"

};



struct irqaction timer_cascade_irqaction = {

	.handler	= no_action,

	.name		= "timer-cascade"

};



struct irqaction halt_switch_irqaction = {

	.handler	= no_action,

	.name		= "halt-switch"

};

arch/alpha/kernel/irq_i8259.c

+2 −6
Original line number Diff line number Diff line
@@ -82,11 +82,6 @@ struct irq_chip i8259a_irq_type = { 
void __init

init_i8259a_irqs(void)

{

	static struct irqaction cascade = {

		.handler	= no_action,

		.name		= "cascade",

	};



	long i;



	outb(0xff, 0x21);	/* mask all of 8259A-1 */
@@ -96,7 +91,8 @@ init_i8259a_irqs(void) 
		irq_set_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);

	}



	setup_irq(2, &cascade);

	if (request_irq(2, no_action, 0, "cascade", NULL))

		pr_err("Failed to request irq 2 (cascade)\n");

}

arch/alpha/kernel/irq_impl.h

+1 −6
Original line number Diff line number Diff line
@@ -21,14 +21,9 @@ extern void isa_no_iack_sc_device_interrupt(unsigned long); 
extern void srm_device_interrupt(unsigned long);

extern void pyxis_device_interrupt(unsigned long);



extern struct irqaction timer_irqaction;

extern struct irqaction isa_cascade_irqaction;

extern struct irqaction timer_cascade_irqaction;

extern struct irqaction halt_switch_irqaction;



extern void init_srm_irqs(long, unsigned long);

extern void init_pyxis_irqs(unsigned long);

extern void init_rtc_irq(void);

extern void init_rtc_irq(irq_handler_t  handler);



extern void common_init_isa_dma(void);

arch/alpha/kernel/irq_pyxis.c

+2 −1
Original line number Diff line number Diff line
@@ -107,5 +107,6 @@ init_pyxis_irqs(unsigned long ignore_mask) 
		irq_set_status_flags(i, IRQ_LEVEL);

	}



	setup_irq(16+7, &isa_cascade_irqaction);

	if (request_irq(16 + 7, no_action, 0, "isa-cascade", NULL))

		pr_err("Failed to register isa-cascade interrupt\n");

}

arch/alpha/kernel/sys_alcor.c

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ alcor_init_irq(void) 
	init_i8259a_irqs();

	common_init_isa_dma();



	setup_irq(16+31, &isa_cascade_irqaction);

	if (request_irq(16 + 31, no_action, 0, "isa-cascade", NULL))

		pr_err("Failed to register isa-cascade interrupt\n");

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE