diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/serial/imx.c | |
parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/serial/imx.c')
-rw-r--r-- | drivers/serial/imx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 4a142d6b8f38..ee5c782597dd 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
@@ -182,7 +182,7 @@ static void imx_start_tx(struct uart_port *port) | |||
182 | imx_transmit_buffer(sport); | 182 | imx_transmit_buffer(sport); |
183 | } | 183 | } |
184 | 184 | ||
185 | static irqreturn_t imx_rtsint(int irq, void *dev_id, struct pt_regs *regs) | 185 | static irqreturn_t imx_rtsint(int irq, void *dev_id) |
186 | { | 186 | { |
187 | struct imx_port *sport = (struct imx_port *)dev_id; | 187 | struct imx_port *sport = (struct imx_port *)dev_id; |
188 | unsigned int val = USR1((u32)sport->port.membase)&USR1_RTSS; | 188 | unsigned int val = USR1((u32)sport->port.membase)&USR1_RTSS; |
@@ -198,7 +198,7 @@ static irqreturn_t imx_rtsint(int irq, void *dev_id, struct pt_regs *regs) | |||
198 | return IRQ_HANDLED; | 198 | return IRQ_HANDLED; |
199 | } | 199 | } |
200 | 200 | ||
201 | static irqreturn_t imx_txint(int irq, void *dev_id, struct pt_regs *regs) | 201 | static irqreturn_t imx_txint(int irq, void *dev_id) |
202 | { | 202 | { |
203 | struct imx_port *sport = (struct imx_port *)dev_id; | 203 | struct imx_port *sport = (struct imx_port *)dev_id; |
204 | struct circ_buf *xmit = &sport->port.info->xmit; | 204 | struct circ_buf *xmit = &sport->port.info->xmit; |
@@ -227,7 +227,7 @@ out: | |||
227 | return IRQ_HANDLED; | 227 | return IRQ_HANDLED; |
228 | } | 228 | } |
229 | 229 | ||
230 | static irqreturn_t imx_rxint(int irq, void *dev_id, struct pt_regs *regs) | 230 | static irqreturn_t imx_rxint(int irq, void *dev_id) |
231 | { | 231 | { |
232 | struct imx_port *sport = dev_id; | 232 | struct imx_port *sport = dev_id; |
233 | unsigned int rx,flg,ignored = 0; | 233 | unsigned int rx,flg,ignored = 0; |
@@ -248,7 +248,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id, struct pt_regs *regs) | |||
248 | } | 248 | } |
249 | 249 | ||
250 | if (uart_handle_sysrq_char | 250 | if (uart_handle_sysrq_char |
251 | (&sport->port, (unsigned char)rx, regs)) | 251 | (&sport->port, (unsigned char)rx)) |
252 | goto ignore_char; | 252 | goto ignore_char; |
253 | 253 | ||
254 | if( rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) | 254 | if( rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) |