From 08256b566282e1f4e28b8a8eb9d005f232a07cc0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 15 Nov 2011 16:01:09 -0800 Subject: [PATCH] --- yaml --- r: 275783 b: refs/heads/master c: 6edf0c9b1c26d047370cf2f35ff6bb3082243ec3 h: refs/heads/master i: 275781: febf2a34efb43c7272a2bb82674502c5ce5e109b 275779: 37c134d859e5a93373eb38595b5d2ef4d9a8b7bd 275775: 6bf27559ec882c9efc4b616d92538169086e652e v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/8250.c | 14 -------------- trunk/drivers/tty/serial/8250.h | 2 -- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 77c33bfa0a07..1b202114a96d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93f3350c46fa5dfcc9650eb19b186e71ffc924c3 +refs/heads/master: 6edf0c9b1c26d047370cf2f35ff6bb3082243ec3 diff --git a/trunk/drivers/tty/serial/8250.c b/trunk/drivers/tty/serial/8250.c index 2b0a4b63c5f7..eeadf1b8e093 100644 --- a/trunk/drivers/tty/serial/8250.c +++ b/trunk/drivers/tty/serial/8250.c @@ -308,8 +308,6 @@ static const struct serial8250_config uart_config[] = { .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_01 | UART_FCR_T_TRIG_01, .flags = UART_CAP_FIFO | UART_CAP_RTOIE, - .mcr_mask = ~UART_MCR_DTR, - .mcr_force = UART_MCR_DTR, }, [PORT_XR17D15X] = { .name = "XR17D15X", @@ -1231,10 +1229,6 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags) up->port.fifosize = uart_config[up->port.type].fifo_size; up->capabilities = uart_config[up->port.type].flags; up->tx_loadsz = uart_config[up->port.type].tx_loadsz; - if (!ALPHA_KLUDGE_MCR) { - up->mcr_mask = uart_config[up->port.type].mcr_mask; - up->mcr_force = uart_config[up->port.type].mcr_force; - } if (up->port.type == PORT_UNKNOWN) goto out; @@ -1993,10 +1987,6 @@ static int serial8250_startup(struct uart_port *port) up->port.fifosize = uart_config[up->port.type].fifo_size; up->tx_loadsz = uart_config[up->port.type].tx_loadsz; up->capabilities = uart_config[up->port.type].flags; - if (!ALPHA_KLUDGE_MCR) { - up->mcr_mask = uart_config[up->port.type].mcr_mask; - up->mcr_force = uart_config[up->port.type].mcr_force; - } up->mcr = 0; if (up->port.iotype != up->cur_iotype) @@ -2803,10 +2793,6 @@ serial8250_init_fixed_type_port(struct uart_8250_port *up, unsigned int type) up->port.fifosize = uart_config[type].fifo_size; up->capabilities = uart_config[type].flags; up->tx_loadsz = uart_config[type].tx_loadsz; - if (!ALPHA_KLUDGE_MCR) { - up->mcr_mask = uart_config[type].mcr_mask; - up->mcr_force = uart_config[type].mcr_force; - } } static void __init diff --git a/trunk/drivers/tty/serial/8250.h b/trunk/drivers/tty/serial/8250.h index 1f7510051707..6edf4a6a22d4 100644 --- a/trunk/drivers/tty/serial/8250.h +++ b/trunk/drivers/tty/serial/8250.h @@ -35,8 +35,6 @@ struct serial8250_config { unsigned short tx_loadsz; unsigned char fcr; unsigned int flags; - unsigned char mcr_mask; - unsigned char mcr_force; }; #define UART_CAP_FIFO (1 << 8) /* UART has FIFO */