diff options
Diffstat (limited to 'drivers/serial/serial_lh7a40x.c')
-rw-r--r-- | drivers/serial/serial_lh7a40x.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 23ddedbaec08..5e1ac356bbb0 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
@@ -135,12 +135,7 @@ static void lh7a40xuart_enable_ms (struct uart_port* port) | |||
135 | BIT_SET (port, UART_R_INTEN, ModemInt); | 135 | BIT_SET (port, UART_R_INTEN, ModemInt); |
136 | } | 136 | } |
137 | 137 | ||
138 | static void | 138 | static void lh7a40xuart_rx_chars (struct uart_port* port) |
139 | #ifdef SUPPORT_SYSRQ | ||
140 | lh7a40xuart_rx_chars (struct uart_port* port, struct pt_regs* regs) | ||
141 | #else | ||
142 | lh7a40xuart_rx_chars (struct uart_port* port) | ||
143 | #endif | ||
144 | { | 139 | { |
145 | struct tty_struct* tty = port->info->tty; | 140 | struct tty_struct* tty = port->info->tty; |
146 | int cbRxMax = 256; /* (Gross) limit on receive */ | 141 | int cbRxMax = 256; /* (Gross) limit on receive */ |
@@ -177,7 +172,7 @@ lh7a40xuart_rx_chars (struct uart_port* port) | |||
177 | flag = TTY_FRAME; | 172 | flag = TTY_FRAME; |
178 | } | 173 | } |
179 | 174 | ||
180 | if (uart_handle_sysrq_char (port, (unsigned char) data, regs)) | 175 | if (uart_handle_sysrq_char (port, (unsigned char) data)) |
181 | continue; | 176 | continue; |
182 | 177 | ||
183 | uart_insert_char(port, data, RxOverrunError, data, flag); | 178 | uart_insert_char(port, data, RxOverrunError, data, flag); |
@@ -248,8 +243,7 @@ static void lh7a40xuart_modem_status (struct uart_port* port) | |||
248 | wake_up_interruptible (&port->info->delta_msr_wait); | 243 | wake_up_interruptible (&port->info->delta_msr_wait); |
249 | } | 244 | } |
250 | 245 | ||
251 | static irqreturn_t lh7a40xuart_int (int irq, void* dev_id, | 246 | static irqreturn_t lh7a40xuart_int (int irq, void* dev_id) |
252 | struct pt_regs* regs) | ||
253 | { | 247 | { |
254 | struct uart_port* port = dev_id; | 248 | struct uart_port* port = dev_id; |
255 | unsigned int cLoopLimit = ISR_LOOP_LIMIT; | 249 | unsigned int cLoopLimit = ISR_LOOP_LIMIT; |
@@ -258,11 +252,7 @@ static irqreturn_t lh7a40xuart_int (int irq, void* dev_id, | |||
258 | 252 | ||
259 | do { | 253 | do { |
260 | if (isr & (RxInt | RxTimeoutInt)) | 254 | if (isr & (RxInt | RxTimeoutInt)) |
261 | #ifdef SUPPORT_SYSRQ | ||
262 | lh7a40xuart_rx_chars(port, regs); | ||
263 | #else | ||
264 | lh7a40xuart_rx_chars(port); | 255 | lh7a40xuart_rx_chars(port); |
265 | #endif | ||
266 | if (isr & ModemInt) | 256 | if (isr & ModemInt) |
267 | lh7a40xuart_modem_status (port); | 257 | lh7a40xuart_modem_status (port); |
268 | if (isr & TxInt) | 258 | if (isr & TxInt) |