diff options
Diffstat (limited to 'drivers/serial/cpm_uart')
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index a0d6136deb9b..0abb544ae63d 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
@@ -248,7 +248,7 @@ static void cpm_uart_break_ctl(struct uart_port *port, int break_state) | |||
248 | /* | 248 | /* |
249 | * Transmit characters, refill buffer descriptor, if possible | 249 | * Transmit characters, refill buffer descriptor, if possible |
250 | */ | 250 | */ |
251 | static void cpm_uart_int_tx(struct uart_port *port, struct pt_regs *regs) | 251 | static void cpm_uart_int_tx(struct uart_port *port) |
252 | { | 252 | { |
253 | pr_debug("CPM uart[%d]:TX INT\n", port->line); | 253 | pr_debug("CPM uart[%d]:TX INT\n", port->line); |
254 | 254 | ||
@@ -258,7 +258,7 @@ static void cpm_uart_int_tx(struct uart_port *port, struct pt_regs *regs) | |||
258 | /* | 258 | /* |
259 | * Receive characters | 259 | * Receive characters |
260 | */ | 260 | */ |
261 | static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) | 261 | static void cpm_uart_int_rx(struct uart_port *port) |
262 | { | 262 | { |
263 | int i; | 263 | int i; |
264 | unsigned char ch, *cp; | 264 | unsigned char ch, *cp; |
@@ -304,7 +304,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) | |||
304 | if (status & | 304 | if (status & |
305 | (BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV)) | 305 | (BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV)) |
306 | goto handle_error; | 306 | goto handle_error; |
307 | if (uart_handle_sysrq_char(port, ch, regs)) | 307 | if (uart_handle_sysrq_char(port, ch)) |
308 | continue; | 308 | continue; |
309 | 309 | ||
310 | error_return: | 310 | error_return: |
@@ -373,7 +373,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) | |||
373 | /* | 373 | /* |
374 | * Asynchron mode interrupt handler | 374 | * Asynchron mode interrupt handler |
375 | */ | 375 | */ |
376 | static irqreturn_t cpm_uart_int(int irq, void *data, struct pt_regs *regs) | 376 | static irqreturn_t cpm_uart_int(int irq, void *data) |
377 | { | 377 | { |
378 | u8 events; | 378 | u8 events; |
379 | struct uart_port *port = (struct uart_port *)data; | 379 | struct uart_port *port = (struct uart_port *)data; |
@@ -389,18 +389,18 @@ static irqreturn_t cpm_uart_int(int irq, void *data, struct pt_regs *regs) | |||
389 | if (events & SMCM_BRKE) | 389 | if (events & SMCM_BRKE) |
390 | uart_handle_break(port); | 390 | uart_handle_break(port); |
391 | if (events & SMCM_RX) | 391 | if (events & SMCM_RX) |
392 | cpm_uart_int_rx(port, regs); | 392 | cpm_uart_int_rx(port); |
393 | if (events & SMCM_TX) | 393 | if (events & SMCM_TX) |
394 | cpm_uart_int_tx(port, regs); | 394 | cpm_uart_int_tx(port); |
395 | } else { | 395 | } else { |
396 | events = sccp->scc_scce; | 396 | events = sccp->scc_scce; |
397 | sccp->scc_scce = events; | 397 | sccp->scc_scce = events; |
398 | if (events & UART_SCCM_BRKE) | 398 | if (events & UART_SCCM_BRKE) |
399 | uart_handle_break(port); | 399 | uart_handle_break(port); |
400 | if (events & UART_SCCM_RX) | 400 | if (events & UART_SCCM_RX) |
401 | cpm_uart_int_rx(port, regs); | 401 | cpm_uart_int_rx(port); |
402 | if (events & UART_SCCM_TX) | 402 | if (events & UART_SCCM_TX) |
403 | cpm_uart_int_tx(port, regs); | 403 | cpm_uart_int_tx(port); |
404 | } | 404 | } |
405 | return (events) ? IRQ_HANDLED : IRQ_NONE; | 405 | return (events) ? IRQ_HANDLED : IRQ_NONE; |
406 | } | 406 | } |