alpha pt_regs cleanups: handle_irq()
PATCH 2/4 alpha pt_regs cleanups: handle_irq()
isa_no_iack_sc_device_interrupt() always gets get_irq_regs() as argument; kill that argument.
All but two callers of handle_irq() pass get_irq_regs() as argument; convert the remaining two, kill set_irq_regs() inside handle_irq().
Signed-off-by Al Viro <[email protected]>
--- arch/alpha/kernel/irq.c | 5 +---- arch/alpha/kernel/irq_alpha.c | 6 ++++-- arch/alpha/kernel/irq_i8259.c | 6 +++--- arch/alpha/kernel/irq_impl.h | 4 ++-- arch/alpha/kernel/irq_pyxis.c | 2 +- arch/alpha/kernel/irq_srm.c | 2 +- arch/alpha/kernel/sys_alcor.c | 2 +- arch/alpha/kernel/sys_cabriolet.c | 2 +- arch/alpha/kernel/sys_dp264.c | 6 +++--- arch/alpha/kernel/sys_eb64p.c | 2 +- arch/alpha/kernel/sys_eiger.c | 10 +++++----- arch/alpha/kernel/sys_jensen.c | 2 +- arch/alpha/kernel/sys_marvel.c | 2 +- arch/alpha/kernel/sys_miata.c | 2 +- arch/alpha/kernel/sys_mikasa.c | 2 +- arch/alpha/kernel/sys_noritake.c | 4 ++-- arch/alpha/kernel/sys_rawhide.c | 2 +- arch/alpha/kernel/sys_rx164.c | 4 ++-- arch/alpha/kernel/sys_sable.c | 2 +- arch/alpha/kernel/sys_takara.c | 10 +++++----- arch/alpha/kernel/sys_titan.c | 2 +- arch/alpha/kernel/sys_wildfire.c | 2 +- 22 files changed, 40 insertions(+), 41 deletions(-)
arch/alpha/kernel/irq.c +1 -4
@@ -127,9 +127,8 @@ #endif#define MAX_ILLEGAL_IRQS 16void -handle_irq (int irq,struct pt_regs * regs) +handle_irq (int irq) { -struct pt_regs *old_regs;/* * We ack quickly, we don't want the irq controller * thinking we're snobs just because some other CPU has
@@ -150,7 +149,6 @@ handle_irq(int irq, struct pt_regs * regreturn ; } - old_regs =set_irq_regs (regs);irq_enter ();/* * __do_IRQ() must be called with IPL_MAX. Note that we do not
@@ -161,5 +159,4 @@ handle_irq(int irq, struct pt_regs * reglocal_irq_disable ();__do_IRQ (irq);irq_exit (); -set_irq_regs (old_regs); }
arch/alpha/kernel/irq_alpha.c +4 -2
@@ -52,6 +52,7 @@ #else#endif break ;case 1 : + old_regs =set_irq_regs (regs);#ifdef CONFIG_SMP {long cpu;
@@ -62,12 +63,13 @@ #ifdef CONFIG_SMPif (cpu != boot_cpuid) {kstat_cpu (cpu).irqs[RTC_IRQ ]++; }else { -handle_irq (RTC_IRQ , regs); +handle_irq (RTC_IRQ ); } }#else -handle_irq (RTC_IRQ , regs); +handle_irq (RTC_IRQ );#endif +set_irq_regs (old_regs);return ;case 2 : alpha_mv.machine_check (vector, la_ptr, regs);
arch/alpha/kernel/irq_i8259.c +3 -3
@@ -147,13 +147,13 @@ isa_device_interrupt(unsigned long vecto*/ int j = *(vuip )IACK_SC ; j &=0xff ; -handle_irq (j,get_irq_regs ()); +handle_irq (j); }#endif #if defined(CONFIG_ALPHA_GENERIC ) || !defined(IACK_SC )void -isa_no_iack_sc_device_interrupt (unsigned long vector,struct pt_regs *regs) +isa_no_iack_sc_device_interrupt (unsigned long vector) {unsigned long pic;
@@ -176,7 +176,7 @@ isa_no_iack_sc_device_interrupt(unsignedwhile (pic) {int j =ffz (~pic); pic &= pic -1 ; -handle_irq (j, regs); +handle_irq (j); } }#endif
arch/alpha/kernel/irq_impl.h +2 -2
@@ -16,7 +16,7 @@ #include <linux/profile.h>#define RTC_IRQ 8extern void isa_device_interrupt (unsigned long ); -extern void isa_no_iack_sc_device_interrupt (unsigned long ,struct pt_regs *); +extern void isa_no_iack_sc_device_interrupt (unsigned long );extern void srm_device_interrupt (unsigned long );extern void pyxis_device_interrupt (unsigned long );
@@ -39,4 +39,4 @@ extern void i8259a_end_irq(unsigned int)extern struct hw_interrupt_type i8259a_irq_type;extern void init_i8259a_irqs (void ); -extern void handle_irq (int irq,struct pt_regs * regs); +extern void handle_irq (int irq);
arch/alpha/kernel/irq_pyxis.c +1 -1
@@ -100,7 +100,7 @@ pyxis_device_interrupt(unsigned long vecif (i ==7 )isa_device_interrupt (vector);else -handle_irq (16 +i,get_irq_regs ()); +handle_irq (16 +i); } }
arch/alpha/kernel/irq_srm.c +1 -1
@@ -75,5 +75,5 @@ void srm_device_interrupt(unsigned long vector) {int irq = (vector -0x800 ) >>4 ; -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); }
arch/alpha/kernel/sys_alcor.c +1 -1
@@ -118,7 +118,7 @@ alcor_device_interrupt(unsigned long vecif (i ==31 ) {isa_device_interrupt (vector); }else { -handle_irq (16 + i,get_irq_regs ()); +handle_irq (16 + i); } } }
arch/alpha/kernel/sys_cabriolet.c +1 -1
@@ -100,7 +100,7 @@ cabriolet_device_interrupt(unsigned longif (i ==4 ) {isa_device_interrupt (v); }else { -handle_irq (16 + i,get_irq_regs ()); +handle_irq (16 + i); } } }
arch/alpha/kernel/sys_dp264.c +3 -3
@@ -238,7 +238,7 @@ #elseif (i ==55 )isa_device_interrupt (vector);else -handle_irq (16 + i,get_irq_regs ()); +handle_irq (16 + i);#if 0 TSUNAMI_cchip->dir0.csr =1UL << i;mb (); tmp = TSUNAMI_cchip->dir0.csr;
@@ -268,7 +268,7 @@ dp264_srm_device_interrupt(unsigned longif (irq >=32 ) irq -=16 ; -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void
@@ -290,7 +290,7 @@ clipper_srm_device_interrupt(unsigned lo* * Eg IRQ 24 is DRIR bit 8, etc, etc */ -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void __init
arch/alpha/kernel/sys_eb64p.c +1 -1
@@ -99,7 +99,7 @@ eb64p_device_interrupt(unsigned long vecif (i ==5 ) {isa_device_interrupt (vector); }else { -handle_irq (16 + i,get_irq_regs ()); +handle_irq (16 + i); } } }
arch/alpha/kernel/sys_eiger.c +5 -5
@@ -118,10 +118,10 @@ eiger_device_interrupt(unsigned long vec* despatch an interrupt if it's set. */ -if (intstatus &8 )handle_irq (16 +3 ,get_irq_regs ()); -if (intstatus &4 )handle_irq (16 +2 ,get_irq_regs ()); -if (intstatus &2 )handle_irq (16 +1 ,get_irq_regs ()); -if (intstatus &1 )handle_irq (16 +0 ,get_irq_regs ()); +if (intstatus &8 )handle_irq (16 +3 ); +if (intstatus &4 )handle_irq (16 +2 ); +if (intstatus &2 )handle_irq (16 +1 ); +if (intstatus &1 )handle_irq (16 +0 ); }else {isa_device_interrupt (vector); }
@@ -131,7 +131,7 @@ static void eiger_srm_device_interrupt(unsigned long vector) {int irq = (vector -0x800 ) >>4 ; -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void __init
arch/alpha/kernel/sys_jensen.c +1 -1
@@ -198,7 +198,7 @@ #define JENSEN_CYCLES_PER_SEC (150000000 }#endif -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void __init
arch/alpha/kernel/sys_marvel.c +1 -1
@@ -64,7 +64,7 @@ io7_device_interrupt(unsigned long vecto irq &=MARVEL_IRQ_VEC_IRQ_MASK ;/* not too many bits */ irq |= pid <<MARVEL_IRQ_VEC_PE_SHIFT ;/* merge the pid */ -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static volatile unsigned long *
arch/alpha/kernel/sys_miata.c +1 -1
@@ -56,7 +56,7 @@ miata_srm_device_interrupt(unsigned longif (irq >=16 ) irq = irq +8 ; -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void __init
arch/alpha/kernel/sys_mikasa.c +1 -1
@@ -99,7 +99,7 @@ mikasa_device_interrupt(unsigned long veif (i <16 ) {isa_device_interrupt (vector); }else { -handle_irq (i,get_irq_regs ()); +handle_irq (i); } } }
arch/alpha/kernel/sys_noritake.c +2 -2
@@ -98,7 +98,7 @@ noritake_device_interrupt(unsigned longif (i <16 ) {isa_device_interrupt (vector); }else { -handle_irq (i,get_irq_regs ()); +handle_irq (i); } } }
@@ -122,7 +122,7 @@ noritake_srm_device_interrupt(unsigned lif (irq >=16 ) irq = irq +1 ; -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void __init
arch/alpha/kernel/sys_rawhide.c +1 -1
@@ -158,7 +158,7 @@ rawhide_srm_device_interrupt(unsigned lo/* Adjust by which hose it is from. */ irq -= ((irq +16 ) >>2 ) &0x38 ; -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void __init
arch/alpha/kernel/sys_rx164.c +2 -2
@@ -102,9 +102,9 @@ rx164_device_interrupt(unsigned long vec i =ffz (~pld); pld &= pld -1 ;/* clear least bit set */ if (i ==20 ) { -isa_no_iack_sc_device_interrupt (vector,get_irq_regs ()); +isa_no_iack_sc_device_interrupt (vector); }else { -handle_irq (16 +i,get_irq_regs ()); +handle_irq (16 +i); } } }
arch/alpha/kernel/sys_sable.c +1 -1
@@ -526,7 +526,7 @@ #if 0printk ("%s: vector 0x%lx bit 0x%x irq 0x%x\n" , __FUNCTION__, vector, bit, irq);#endif -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void __init
arch/alpha/kernel/sys_takara.c +5 -5
@@ -112,10 +112,10 @@ takara_device_interrupt(unsigned long ve* despatch an interrupt if it's set. */ -if (intstatus &8 )handle_irq (16 +3 ,get_irq_regs ()); -if (intstatus &4 )handle_irq (16 +2 ,get_irq_regs ()); -if (intstatus &2 )handle_irq (16 +1 ,get_irq_regs ()); -if (intstatus &1 )handle_irq (16 +0 ,get_irq_regs ()); +if (intstatus &8 )handle_irq (16 +3 ); +if (intstatus &4 )handle_irq (16 +2 ); +if (intstatus &2 )handle_irq (16 +1 ); +if (intstatus &1 )handle_irq (16 +0 ); }else {isa_device_interrupt (vector); }
@@ -125,7 +125,7 @@ static void takara_srm_device_interrupt(unsigned long vector) {int irq = (vector -0x800 ) >>4 ; -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); } static void __init
arch/alpha/kernel/sys_titan.c +1 -1
@@ -178,7 +178,7 @@ titan_srm_device_interrupt(unsigned longint irq; irq = (vector -0x800 ) >>4 ; -handle_irq (irq,get_irq_regs ()); +handle_irq (irq); }
arch/alpha/kernel/sys_wildfire.c +1 -1
@@ -246,7 +246,7 @@ wildfire_device_interrupt(unsigned long* bits 5-0: irq in PCA */ -handle_irq (irq,get_irq_regs ()); +handle_irq (irq);return ; }
Signature · 1 line
1.4.2.GIT