Initial blind fixup for arm for irq changes

Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8 files changed, 30 insertions, 40 deletions

diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index 440e9aa0211a..23d5beea5568 100644
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -112,8 +112,7 @@ static struct irqchip  bast_pc104_chip = {
 
 static void
 bast_irq_pc104_demux(unsigned int irq,
-                     struct irqdesc *desc,
-                     struct pt_regs *regs)
+                     struct irqdesc *desc)
 {
         unsigned int stat;
         unsigned int irqno;
@@ -133,7 +132,7 @@ bast_irq_pc104_demux(unsigned int irq,
                         if (stat & 1) {
                                 irqno = bast_pc104_irqs[i];
                                 desc = irq_desc + irqno;
-                                desc_handle_irq(irqno, desc, regs);
+                                desc_handle_irq(irqno, desc);
                         }
                 }
         }
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
index d264bbbd8bef..3d211dc2f2f9 100644
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
@@ -595,7 +595,7 @@ s3c2410_dma_lastxfer(struct s3c2410_dma_chan *chan)
 #define dmadbg2(x...)
 
 static irqreturn_t
-s3c2410_dma_irq(int irq, void *devpw, struct pt_regs *regs)
+s3c2410_dma_irq(int irq, void *devpw)
 {
         struct s3c2410_dma_chan *chan = (struct s3c2410_dma_chan *)devpw;
         struct s3c2410_dma_buf  *buf;
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index 3e9f3462c61b..683b3491ba3c 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -480,8 +480,7 @@ static struct irqchip s3c_irq_adc = {
 
 /* irq demux for adc */
 static void s3c_irq_demux_adc(unsigned int irq,
-                              struct irqdesc *desc,
-                              struct pt_regs *regs)
+                              struct irqdesc *desc)
 {
         unsigned int subsrc, submsk;
         unsigned int offset = 9;
@@ -500,17 +499,16 @@ static void s3c_irq_demux_adc(unsigned int irq,
         if (subsrc != 0) {
                 if (subsrc & 1) {
                         mydesc = irq_desc + IRQ_TC;
-                        desc_handle_irq(IRQ_TC, mydesc, regs);
+                        desc_handle_irq(IRQ_TC, mydesc);
                 }
                 if (subsrc & 2) {
                         mydesc = irq_desc + IRQ_ADC;
-                        desc_handle_irq(IRQ_ADC, mydesc, regs);
+                        desc_handle_irq(IRQ_ADC, mydesc);
                 }
         }
 }
 
-static void s3c_irq_demux_uart(unsigned int start,
-                               struct pt_regs *regs)
+static void s3c_irq_demux_uart(unsigned int start)
 {
         unsigned int subsrc, submsk;
         unsigned int offset = start - IRQ_S3CUART_RX0;
@@ -533,17 +531,17 @@ static void s3c_irq_demux_uart(unsigned int start,
                 desc = irq_desc + start;
 
                 if (subsrc & 1)
-                        desc_handle_irq(start, desc, regs);
+                        desc_handle_irq(start, desc);
 
                 desc++;
 
                 if (subsrc & 2)
-                        desc_handle_irq(start+1, desc, regs);
+                        desc_handle_irq(start+1, desc);
 
                 desc++;
 
                 if (subsrc & 4)
-                        desc_handle_irq(start+2, desc, regs);
+                        desc_handle_irq(start+2, desc);
         }
 }
 
@@ -551,35 +549,31 @@ static void s3c_irq_demux_uart(unsigned int start,
 
 static void
 s3c_irq_demux_uart0(unsigned int irq,
-                    struct irqdesc *desc,
-                    struct pt_regs *regs)
+                    struct irqdesc *desc)
 {
         irq = irq;
-        s3c_irq_demux_uart(IRQ_S3CUART_RX0, regs);
+        s3c_irq_demux_uart(IRQ_S3CUART_RX0);
 }
 
 static void
 s3c_irq_demux_uart1(unsigned int irq,
-                    struct irqdesc *desc,
-                    struct pt_regs *regs)
+                    struct irqdesc *desc)
 {
         irq = irq;
-        s3c_irq_demux_uart(IRQ_S3CUART_RX1, regs);
+        s3c_irq_demux_uart(IRQ_S3CUART_RX1);
 }
 
 static void
 s3c_irq_demux_uart2(unsigned int irq,
-                    struct irqdesc *desc,
-                    struct pt_regs *regs)
+                    struct irqdesc *desc)
 {
         irq = irq;
-        s3c_irq_demux_uart(IRQ_S3CUART_RX2, regs);
+        s3c_irq_demux_uart(IRQ_S3CUART_RX2);
 }
 
 static void
 s3c_irq_demux_extint8(unsigned int irq,
-                      struct irqdesc *desc,
-                      struct pt_regs *regs)
+                      struct irqdesc *desc)
 {
         unsigned long eintpnd = __raw_readl(S3C24XX_EINTPEND);
         unsigned long eintmsk = __raw_readl(S3C24XX_EINTMASK);
@@ -594,15 +588,14 @@ s3c_irq_demux_extint8(unsigned int irq,
                 eintpnd &= ~(1<<irq);
 
                 irq += (IRQ_EINT4 - 4);
-                desc_handle_irq(irq, irq_desc + irq, regs);
+                desc_handle_irq(irq, irq_desc + irq);
         }
 
 }
 
 static void
 s3c_irq_demux_extint4t7(unsigned int irq,
-                        struct irqdesc *desc,
-                        struct pt_regs *regs)
+                        struct irqdesc *desc)
 {
         unsigned long eintpnd = __raw_readl(S3C24XX_EINTPEND);
         unsigned long eintmsk = __raw_readl(S3C24XX_EINTMASK);
@@ -618,7 +611,7 @@ s3c_irq_demux_extint4t7(unsigned int irq,
 
                 irq += (IRQ_EINT4 - 4);
 
-                desc_handle_irq(irq, irq_desc + irq, regs);
+                desc_handle_irq(irq, irq_desc + irq);
         }
 }
 
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index ba5109af40b4..817e2c684410 100644
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -226,7 +226,7 @@ static struct s3c2410fb_mach_info __initdata amlm5900_lcd_info = {
 #endif
 
 static irqreturn_t
-amlm5900_wake_interrupt(int irq, void *ignored, struct pt_regs *regs)
+amlm5900_wake_interrupt(int irq, void *ignored)
 {
         return IRQ_HANDLED;
 }
diff --git a/arch/arm/mach-s3c2410/s3c2440-irq.c b/arch/arm/mach-s3c2410/s3c2440-irq.c
index fc08febe2e54..39db0752d53b 100644
--- a/arch/arm/mach-s3c2410/s3c2440-irq.c
+++ b/arch/arm/mach-s3c2410/s3c2440-irq.c
@@ -42,8 +42,7 @@
 /* WDT/AC97 */
 
 static void s3c_irq_demux_wdtac97(unsigned int irq,
-                                  struct irqdesc *desc,
-                                  struct pt_regs *regs)
+                                  struct irqdesc *desc)
 {
         unsigned int subsrc, submsk;
         struct irqdesc *mydesc;
@@ -61,11 +60,11 @@ static void s3c_irq_demux_wdtac97(unsigned int irq,
         if (subsrc != 0) {
                 if (subsrc & 1) {
                         mydesc = irq_desc + IRQ_S3C2440_WDT;
-                        desc_handle_irq(IRQ_S3C2440_WDT, mydesc, regs);
+                        desc_handle_irq(IRQ_S3C2440_WDT, mydesc);
                 }
                 if (subsrc & 2) {
                         mydesc = irq_desc + IRQ_S3C2440_AC97;
-                        desc_handle_irq(IRQ_S3C2440_AC97, mydesc, regs);
+                        desc_handle_irq(IRQ_S3C2440_AC97, mydesc);
                 }
         }
 }
diff --git a/arch/arm/mach-s3c2410/s3c244x-irq.c b/arch/arm/mach-s3c2410/s3c244x-irq.c
index ec702f88b299..146f2109dd90 100644
--- a/arch/arm/mach-s3c2410/s3c244x-irq.c
+++ b/arch/arm/mach-s3c2410/s3c244x-irq.c
@@ -42,8 +42,7 @@
 /* camera irq */
 
 static void s3c_irq_demux_cam(unsigned int irq,
-                              struct irqdesc *desc,
-                              struct pt_regs *regs)
+                              struct irqdesc *desc)
 {
         unsigned int subsrc, submsk;
         struct irqdesc *mydesc;
@@ -61,11 +60,11 @@ static void s3c_irq_demux_cam(unsigned int irq,
         if (subsrc != 0) {
                 if (subsrc & 1) {
                         mydesc = irq_desc + IRQ_S3C2440_CAM_C;
-                        desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc, regs);
+                        desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc);
                 }
                 if (subsrc & 2) {
                         mydesc = irq_desc + IRQ_S3C2440_CAM_P;
-                        desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc, regs);
+                        desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc);
                 }
         }
 }
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
index 00d1cfca9712..9910bf0f2cea 100644
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
@@ -128,10 +128,10 @@ static unsigned long s3c2410_gettimeoffset (void)
  * IRQ handler for the timer
  */
 static irqreturn_t
-s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+s3c2410_timer_interrupt(int irq, void *dev_id)
 {
         write_seqlock(&xtime_lock);
-        timer_tick(regs);
+        timer_tick();
         write_sequnlock(&xtime_lock);
         return IRQ_HANDLED;
 }
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c
index c635efa7cd31..22b0e1cdd4bf 100644
--- a/arch/arm/mach-s3c2410/usb-simtec.c
+++ b/arch/arm/mach-s3c2410/usb-simtec.c
@@ -58,7 +58,7 @@ usb_simtec_powercontrol(int port, int to)
 }
 
 static irqreturn_t
-usb_simtec_ocirq(int irq, void *pw, struct pt_regs *regs)
+usb_simtec_ocirq(int irq, void *pw)
 {
         struct s3c2410_hcd_info *info = (struct s3c2410_hcd_info *)pw;