patch-2.1.121 linux/arch/alpha/kernel/sys_sx164.c

Next file: linux/arch/alpha/kernel/sys_takara.c
Previous file: linux/arch/alpha/kernel/sys_sable.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.120/linux/arch/alpha/kernel/sys_sx164.c linux/arch/alpha/kernel/sys_sx164.c
@@ -68,9 +68,6 @@
 {
 	unsigned long pld, tmp;
 	unsigned int i;
-	unsigned long flags;
-
-	save_and_cli(flags);
 
 	/* Read the interrupt summary register of PYXIS */
 	pld = *(vulp)PYXIS_INT_REQ;
@@ -101,14 +98,12 @@
 		*(vulp)PYXIS_INT_REQ = 1UL << i; mb();
 		tmp = *(vulp)PYXIS_INT_REQ;
 	}
-	restore_flags(flags);
 }
 
 static void
 sx164_init_irq(void)
 {
-	outb(0, DMA1_RESET_REG);
-	outb(0, DMA2_RESET_REG);
+	STANDARD_INIT_IRQ_PROLOG;
 
 	if (alpha_using_srm) {
 		alpha_mv.update_irq_hw = sx164_srm_update_irq_hw;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov