diff options
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r-- | arch/arm/mach-sa1100/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/irq.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/neponset.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/ssp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/time.c | 8 |
6 files changed, 15 insertions, 16 deletions
diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c index 2ea2a657a034..1fbe053e8b59 100644 --- a/arch/arm/mach-sa1100/dma.c +++ b/arch/arm/mach-sa1100/dma.c | |||
@@ -42,7 +42,7 @@ static sa1100_dma_t dma_chan[SA1100_DMA_CHANNELS]; | |||
42 | static spinlock_t dma_list_lock; | 42 | static spinlock_t dma_list_lock; |
43 | 43 | ||
44 | 44 | ||
45 | static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs) | 45 | static irqreturn_t dma_irq_handler(int irq, void *dev_id) |
46 | { | 46 | { |
47 | dma_regs_t *dma_regs = dev_id; | 47 | dma_regs_t *dma_regs = dev_id; |
48 | sa1100_dma_t *dma = dma_chan + (((u_int)dma_regs >> 5) & 7); | 48 | sa1100_dma_t *dma = dma_chan + (((u_int)dma_regs >> 5) & 7); |
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 7364478cec12..fa6dc71bd6ad 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
@@ -702,7 +702,7 @@ static u32 gpio_irq_mask[] = { | |||
702 | GPIO2_SD_CON_SLT, | 702 | GPIO2_SD_CON_SLT, |
703 | }; | 703 | }; |
704 | 704 | ||
705 | static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 705 | static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc) |
706 | { | 706 | { |
707 | int i; | 707 | int i; |
708 | 708 | ||
@@ -719,14 +719,14 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_re | |||
719 | if (0) printk("%s KPIO 0x%08X\n", __FUNCTION__, irq); | 719 | if (0) printk("%s KPIO 0x%08X\n", __FUNCTION__, irq); |
720 | for (j = 0; j < H3800_KPIO_IRQ_COUNT; j++) | 720 | for (j = 0; j < H3800_KPIO_IRQ_COUNT; j++) |
721 | if (irq & kpio_irq_mask[j]) | 721 | if (irq & kpio_irq_mask[j]) |
722 | do_edge_IRQ(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j, regs); | 722 | do_edge_IRQ(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j); |
723 | 723 | ||
724 | /* GPIO2 */ | 724 | /* GPIO2 */ |
725 | irq = H3800_ASIC2_GPIINTFLAG; | 725 | irq = H3800_ASIC2_GPIINTFLAG; |
726 | if (0) printk("%s GPIO 0x%08X\n", __FUNCTION__, irq); | 726 | if (0) printk("%s GPIO 0x%08X\n", __FUNCTION__, irq); |
727 | for (j = 0; j < H3800_GPIO_IRQ_COUNT; j++) | 727 | for (j = 0; j < H3800_GPIO_IRQ_COUNT; j++) |
728 | if (irq & gpio_irq_mask[j]) | 728 | if (irq & gpio_irq_mask[j]) |
729 | do_edge_IRQ(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j , regs); | 729 | do_edge_IRQ(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j); |
730 | } | 730 | } |
731 | 731 | ||
732 | if (i >= MAX_ASIC_ISR_LOOPS) | 732 | if (i >= MAX_ASIC_ISR_LOOPS) |
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c index b55b90a2e8fe..f4c6322ca33e 100644 --- a/arch/arm/mach-sa1100/irq.c +++ b/arch/arm/mach-sa1100/irq.c | |||
@@ -110,8 +110,7 @@ static struct irq_chip sa1100_low_gpio_chip = { | |||
110 | * and call the handler. | 110 | * and call the handler. |
111 | */ | 111 | */ |
112 | static void | 112 | static void |
113 | sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc, | 113 | sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc) |
114 | struct pt_regs *regs) | ||
115 | { | 114 | { |
116 | unsigned int mask; | 115 | unsigned int mask; |
117 | 116 | ||
@@ -128,7 +127,7 @@ sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc, | |||
128 | mask >>= 11; | 127 | mask >>= 11; |
129 | do { | 128 | do { |
130 | if (mask & 1) | 129 | if (mask & 1) |
131 | desc_handle_irq(irq, desc, regs); | 130 | desc_handle_irq(irq, desc); |
132 | mask >>= 1; | 131 | mask >>= 1; |
133 | irq++; | 132 | irq++; |
134 | desc++; | 133 | desc++; |
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index af6d2775cf82..354d5e91da59 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c | |||
@@ -29,7 +29,7 @@ | |||
29 | * is rather unfortunate. | 29 | * is rather unfortunate. |
30 | */ | 30 | */ |
31 | static void | 31 | static void |
32 | neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 32 | neponset_irq_handler(unsigned int irq, struct irqdesc *desc) |
33 | { | 33 | { |
34 | unsigned int irr; | 34 | unsigned int irr; |
35 | 35 | ||
@@ -69,12 +69,12 @@ neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg | |||
69 | 69 | ||
70 | if (irr & IRR_ETHERNET) { | 70 | if (irr & IRR_ETHERNET) { |
71 | d = irq_desc + IRQ_NEPONSET_SMC9196; | 71 | d = irq_desc + IRQ_NEPONSET_SMC9196; |
72 | desc_handle_irq(IRQ_NEPONSET_SMC9196, d, regs); | 72 | desc_handle_irq(IRQ_NEPONSET_SMC9196, d); |
73 | } | 73 | } |
74 | 74 | ||
75 | if (irr & IRR_USAR) { | 75 | if (irr & IRR_USAR) { |
76 | d = irq_desc + IRQ_NEPONSET_USAR; | 76 | d = irq_desc + IRQ_NEPONSET_USAR; |
77 | desc_handle_irq(IRQ_NEPONSET_USAR, d, regs); | 77 | desc_handle_irq(IRQ_NEPONSET_USAR, d); |
78 | } | 78 | } |
79 | 79 | ||
80 | desc->chip->unmask(irq); | 80 | desc->chip->unmask(irq); |
@@ -82,7 +82,7 @@ neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg | |||
82 | 82 | ||
83 | if (irr & IRR_SA1111) { | 83 | if (irr & IRR_SA1111) { |
84 | d = irq_desc + IRQ_NEPONSET_SA1111; | 84 | d = irq_desc + IRQ_NEPONSET_SA1111; |
85 | desc_handle_irq(IRQ_NEPONSET_SA1111, d, regs); | 85 | desc_handle_irq(IRQ_NEPONSET_SA1111, d); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | } | 88 | } |
diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c index 5eba5fbbb561..59703c6fb29b 100644 --- a/arch/arm/mach-sa1100/ssp.c +++ b/arch/arm/mach-sa1100/ssp.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #define TIMEOUT 100000 | 26 | #define TIMEOUT 100000 |
27 | 27 | ||
28 | static irqreturn_t ssp_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 28 | static irqreturn_t ssp_interrupt(int irq, void *dev_id) |
29 | { | 29 | { |
30 | unsigned int status = Ser4SSSR; | 30 | unsigned int status = Ser4SSSR; |
31 | 31 | ||
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 49ae716e16c2..4284bd6f7a1f 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c | |||
@@ -77,7 +77,7 @@ static int match_posponed; | |||
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | static irqreturn_t | 79 | static irqreturn_t |
80 | sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 80 | sa1100_timer_interrupt(int irq, void *dev_id) |
81 | { | 81 | { |
82 | unsigned int next_match; | 82 | unsigned int next_match; |
83 | 83 | ||
@@ -99,7 +99,7 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
99 | * handlers. | 99 | * handlers. |
100 | */ | 100 | */ |
101 | do { | 101 | do { |
102 | timer_tick(regs); | 102 | timer_tick(); |
103 | OSSR = OSSR_M0; /* Clear match on timer 0 */ | 103 | OSSR = OSSR_M0; /* Clear match on timer 0 */ |
104 | next_match = (OSMR0 += LATCH); | 104 | next_match = (OSMR0 += LATCH); |
105 | } while ((signed long)(next_match - OSCR) <= 0); | 105 | } while ((signed long)(next_match - OSCR) <= 0); |
@@ -151,13 +151,13 @@ static void sa1100_dyn_tick_reprogram(unsigned long ticks) | |||
151 | } | 151 | } |
152 | 152 | ||
153 | static irqreturn_t | 153 | static irqreturn_t |
154 | sa1100_dyn_tick_handler(int irq, void *dev_id, struct pt_regs *regs) | 154 | sa1100_dyn_tick_handler(int irq, void *dev_id) |
155 | { | 155 | { |
156 | if (match_posponed) { | 156 | if (match_posponed) { |
157 | match_posponed = 0; | 157 | match_posponed = 0; |
158 | OSMR0 = initial_match; | 158 | OSMR0 = initial_match; |
159 | if ((signed long)(initial_match - OSCR) <= 0) | 159 | if ((signed long)(initial_match - OSCR) <= 0) |
160 | return sa1100_timer_interrupt(irq, dev_id, regs); | 160 | return sa1100_timer_interrupt(irq, dev_id); |
161 | } | 161 | } |
162 | return IRQ_NONE; | 162 | return IRQ_NONE; |
163 | } | 163 | } |