[linuxsh-cvs] CVS: linux/arch/sh/cchips/hd6446x/hd64461 setup.c, 1.7, 1.8

[Paul M. <le...@us...>]

Update of /cvsroot/linuxsh/linux/arch/sh/cchips/hd6446x/hd64461
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4439/arch/sh/cchips/hd6446x/hd64461

Modified Files:
	setup.c 
Log Message:
More local IRQ purging, due to generic hardirq locking.



Index: setup.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/cchips/hd6446x/hd64461/setup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- setup.c	4 Jan 2006 14:53:18 -0000	1.7
+++ setup.c	7 Aug 2006 02:22:11 -0000	1.8
@@ -12,35 +12,28 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/hd64461.h>
 
 static void disable_hd64461_irq(unsigned int irq)
 {
-	unsigned long flags;
 	unsigned short nimr;
 	unsigned short mask = 1 << (irq - HD64461_IRQBASE);
 
-	local_irq_save(flags);
 	nimr = inw(HD64461_NIMR);
 	nimr |= mask;
 	outw(nimr, HD64461_NIMR);
-	local_irq_restore(flags);
 }
 
 static void enable_hd64461_irq(unsigned int irq)
 {
-	unsigned long flags;
 	unsigned short nimr;
 	unsigned short mask = 1 << (irq - HD64461_IRQBASE);
 
-	local_irq_save(flags);
 	nimr = inw(HD64461_NIMR);
 	nimr &= ~mask;
 	outw(nimr, HD64461_NIMR);
-	local_irq_restore(flags);
 }
 
 static void mask_and_ack_hd64461(unsigned int irq)