projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
drivers
/
serial
/
serial_lh7a40x.c
diff --git
a/drivers/serial/serial_lh7a40x.c
b/drivers/serial/serial_lh7a40x.c
index
776d4ff
..
eb18d42
100644
(file)
--- a/
drivers/serial/serial_lh7a40x.c
+++ b/
drivers/serial/serial_lh7a40x.c
@@
-27,7
+27,6
@@
*
*/
*
*/
-#include <linux/config.h>
#if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
@@
-136,12
+135,7
@@
static void lh7a40xuart_enable_ms (struct uart_port* port)
BIT_SET (port, UART_R_INTEN, ModemInt);
}
BIT_SET (port, UART_R_INTEN, ModemInt);
}
-static void
-#ifdef SUPPORT_SYSRQ
-lh7a40xuart_rx_chars (struct uart_port* port, struct pt_regs* regs)
-#else
-lh7a40xuart_rx_chars (struct uart_port* port)
-#endif
+static void lh7a40xuart_rx_chars (struct uart_port* port)
{
struct tty_struct* tty = port->info->tty;
int cbRxMax = 256; /* (Gross) limit on receive */
{
struct tty_struct* tty = port->info->tty;
int cbRxMax = 256; /* (Gross) limit on receive */
@@
-178,7
+172,7
@@
lh7a40xuart_rx_chars (struct uart_port* port)
flag = TTY_FRAME;
}
flag = TTY_FRAME;
}
- if (uart_handle_sysrq_char (port, (unsigned char) data
, regs
))
+ if (uart_handle_sysrq_char (port, (unsigned char) data))
continue;
uart_insert_char(port, data, RxOverrunError, data, flag);
continue;
uart_insert_char(port, data, RxOverrunError, data, flag);
@@
-249,8
+243,7
@@
static void lh7a40xuart_modem_status (struct uart_port* port)
wake_up_interruptible (&port->info->delta_msr_wait);
}
wake_up_interruptible (&port->info->delta_msr_wait);
}
-static irqreturn_t lh7a40xuart_int (int irq, void* dev_id,
- struct pt_regs* regs)
+static irqreturn_t lh7a40xuart_int (int irq, void* dev_id)
{
struct uart_port* port = dev_id;
unsigned int cLoopLimit = ISR_LOOP_LIMIT;
{
struct uart_port* port = dev_id;
unsigned int cLoopLimit = ISR_LOOP_LIMIT;
@@
-259,11
+252,7
@@
static irqreturn_t lh7a40xuart_int (int irq, void* dev_id,
do {
if (isr & (RxInt | RxTimeoutInt))
do {
if (isr & (RxInt | RxTimeoutInt))
-#ifdef SUPPORT_SYSRQ
- lh7a40xuart_rx_chars(port, regs);
-#else
lh7a40xuart_rx_chars(port);
lh7a40xuart_rx_chars(port);
-#endif
if (isr & ModemInt)
lh7a40xuart_modem_status (port);
if (isr & TxInt)
if (isr & ModemInt)
lh7a40xuart_modem_status (port);
if (isr & TxInt)
@@
-359,8
+348,8
@@
static void lh7a40xuart_shutdown (struct uart_port* port)
}
static void lh7a40xuart_set_termios (struct uart_port* port,
}
static void lh7a40xuart_set_termios (struct uart_port* port,
- struct termios* termios,
- struct termios* old)
+ struct
k
termios* termios,
+ struct
k
termios* old)
{
unsigned int con;
unsigned int inten;
{
unsigned int con;
unsigned int inten;