serial: treewide: Remove empty implementations of enable_ms()

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c
index c7e8b60b61776bd1f2ea5da9d65e11cb83799a50..9b208bd686e6091488b8bfc6187264a964ff9005 100644 (file)
--- a/drivers/tty/serial/21285.c
+++ b/drivers/tty/serial/21285.c
@@ -78,10 +78,6 @@ static void serial21285_stop_rx(struct uart_port *port)
        }
 }
 
-static void serial21285_enable_ms(struct uart_port *port)
-{
-}
-
 static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
@@ -345,7 +341,6 @@ static struct uart_ops serial21285_ops = {
        .stop_tx        = serial21285_stop_tx,
        .start_tx       = serial21285_start_tx,
        .stop_rx        = serial21285_stop_rx,
-       .enable_ms      = serial21285_enable_ms,
        .break_ctl      = serial21285_break_ctl,
        .startup        = serial21285_startup,
        .shutdown       = serial21285_shutdown,

diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index 59b3da9bcc3f031c922ffd16f7321ed727e53ade..e7d1aaf07294a18aeeca7719044f330026c45cab 100644 (file)
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -109,10 +109,6 @@ static void altera_jtaguart_break_ctl(struct uart_port *port, int break_state)
 {
 }
 
-static void altera_jtaguart_enable_ms(struct uart_port *port)
-{
-}
-
 static void altera_jtaguart_set_termios(struct uart_port *port,
                                        struct ktermios *termios,
                                        struct ktermios *old)
@@ -291,7 +287,6 @@ static struct uart_ops altera_jtaguart_ops = {
        .start_tx       = altera_jtaguart_start_tx,
        .stop_tx        = altera_jtaguart_stop_tx,
        .stop_rx        = altera_jtaguart_stop_rx,
-       .enable_ms      = altera_jtaguart_enable_ms,
        .break_ctl      = altera_jtaguart_break_ctl,
        .startup        = altera_jtaguart_startup,
        .shutdown       = altera_jtaguart_shutdown,

diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 323376668b72c1678a1dbfafa8bf3ef9af50647c..4c1eae93110c4b1c90e18d06e4b4a0ad005d4a8c 100644 (file)
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -163,10 +163,6 @@ static void altera_uart_break_ctl(struct uart_port *port, int break_state)
        spin_unlock_irqrestore(&port->lock, flags);
 }
 
-static void altera_uart_enable_ms(struct uart_port *port)
-{
-}
-
 static void altera_uart_set_termios(struct uart_port *port,
                                    struct ktermios *termios,
                                    struct ktermios *old)
@@ -415,7 +411,6 @@ static struct uart_ops altera_uart_ops = {
        .start_tx       = altera_uart_start_tx,
        .stop_tx        = altera_uart_stop_tx,
        .stop_rx        = altera_uart_stop_rx,
-       .enable_ms      = altera_uart_enable_ms,
        .break_ctl      = altera_uart_break_ctl,
        .startup        = altera_uart_startup,
        .shutdown       = altera_uart_shutdown,

diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index de11ab8ffd910481bc43a13c52b76ca6cefa2d82..a34a0cec16857e07fb3063bac80c208753729d99 100644 (file)
--- a/drivers/tty/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c
@@ -71,11 +71,6 @@ static void apbuart_stop_rx(struct uart_port *port)
        UART_PUT_CTRL(port, cr);
 }
 
-static void apbuart_enable_ms(struct uart_port *port)
-{
-       /* No modem status change interrupts for APBUART */
-}
-
 static void apbuart_rx_chars(struct uart_port *port)
 {
        unsigned int status, ch, rsr, flag;
@@ -337,7 +332,6 @@ static struct uart_ops grlib_apbuart_ops = {
        .stop_tx = apbuart_stop_tx,
        .start_tx = apbuart_start_tx,
        .stop_rx = apbuart_stop_rx,
-       .enable_ms = apbuart_enable_ms,
        .break_ctl = apbuart_break_ctl,
        .startup = apbuart_startup,
        .shutdown = apbuart_shutdown,

diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
index acd03af7cd52287759a5b06275119f0856325fc0..0be1c45efd659145189f95cc739ef5c8198bda6b 100644 (file)
--- a/drivers/tty/serial/ar933x_uart.c
+++ b/drivers/tty/serial/ar933x_uart.c
@@ -176,10 +176,6 @@ static void ar933x_uart_break_ctl(struct uart_port *port, int break_state)
        spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-static void ar933x_uart_enable_ms(struct uart_port *port)
-{
-}
-
 /*
  * baudrate = (clk / (scale + 1)) * (step * (1 / 2^17))
  */
@@ -495,7 +491,6 @@ static struct uart_ops ar933x_uart_ops = {
        .stop_tx        = ar933x_uart_stop_tx,
        .start_tx       = ar933x_uart_start_tx,
        .stop_rx        = ar933x_uart_stop_rx,
-       .enable_ms      = ar933x_uart_enable_ms,
        .break_ctl      = ar933x_uart_break_ctl,
        .startup        = ar933x_uart_startup,
        .shutdown       = ar933x_uart_shutdown,

diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
index c9f5c9dcc15c48e7a15171db06f957bfe7fc6bfd..643658f2b5b26d21729eefe7e7e37ca5f857e986 100644 (file)
--- a/drivers/tty/serial/arc_uart.c
+++ b/drivers/tty/serial/arc_uart.c
@@ -340,13 +340,6 @@ static void arc_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
        /* MCR not present */
 }
 
-/* Enable Modem Status Interrupts */
-
-static void arc_serial_enable_ms(struct uart_port *port)
-{
-       /* MSR not present */
-}
-
 static void arc_serial_break_ctl(struct uart_port *port, int break_state)
 {
        /* ARC UART doesn't support sending Break signal */
@@ -510,7 +503,6 @@ static struct uart_ops arc_serial_pops = {
        .stop_tx        = arc_serial_stop_tx,
        .start_tx       = arc_serial_start_tx,
        .stop_rx        = arc_serial_stop_rx,
-       .enable_ms      = arc_serial_enable_ms,
        .break_ctl      = arc_serial_break_ctl,
        .startup        = arc_serial_startup,
        .shutdown       = arc_serial_shutdown,

diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index 4f229703328b6e2be09e0cfb111e8e81f8be1c79..1174efa466a6f22a9da71dbc78174e25514f7c5b 100644 (file)
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -426,11 +426,6 @@ static void sport_stop_rx(struct uart_port *port)
        SSYNC();
 }
 
-static void sport_enable_ms(struct uart_port *port)
-{
-       pr_debug("%s enter\n", __func__);
-}
-
 static void sport_break_ctl(struct uart_port *port, int break_state)
 {
        pr_debug("%s enter\n", __func__);
@@ -587,7 +582,6 @@ struct uart_ops sport_uart_ops = {
        .stop_tx        = sport_stop_tx,
        .start_tx       = sport_start_tx,
        .stop_rx        = sport_stop_rx,
-       .enable_ms      = sport_enable_ms,
        .break_ctl      = sport_break_ctl,
        .startup        = sport_startup,
        .shutdown       = sport_shutdown,

diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index ac86a20992e9fcb26394f2a1a1b190227c7a1d38..dddc081568f176b12c397b66008811468fb01fa0 100644 (file)
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -200,14 +200,6 @@ static void bfin_serial_stop_rx(struct uart_port *port)
        UART_CLEAR_IER(uart, ERBFI);
 }
 
-/*
- * Set the modem control timer to fire immediately.
- */
-static void bfin_serial_enable_ms(struct uart_port *port)
-{
-}
-
-
 #if ANOMALY_05000363 && defined(CONFIG_SERIAL_BFIN_PIO)
 # define UART_GET_ANOMALY_THRESHOLD(uart)    ((uart)->anomaly_threshold)
 # define UART_SET_ANOMALY_THRESHOLD(uart, v) ((uart)->anomaly_threshold = (v))
@@ -1014,7 +1006,6 @@ static struct uart_ops bfin_serial_pops = {
        .stop_tx        = bfin_serial_stop_tx,
        .start_tx       = bfin_serial_start_tx,
        .stop_rx        = bfin_serial_stop_rx,
-       .enable_ms      = bfin_serial_enable_ms,
        .break_ctl      = bfin_serial_break_ctl,
        .startup        = bfin_serial_startup,
        .shutdown       = bfin_serial_shutdown,

diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index 14aaea0d4131072d2bf1b5b5c45d0de048e835d6..f5b4c3d7e38fef6000b21e00b788e4e80d70a578 100644 (file)
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -352,7 +352,6 @@ static const struct uart_ops uart_clps711x_ops = {
        .stop_tx        = uart_clps711x_stop_tx,
        .start_tx       = uart_clps711x_start_tx,
        .stop_rx        = uart_clps711x_nop_void,
-       .enable_ms      = uart_clps711x_nop_void,
        .break_ctl      = uart_clps711x_break_ctl,
        .set_ldisc      = uart_clps711x_set_ldisc,
        .startup        = uart_clps711x_startup,

diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index aa60e6d13ecaffb76887088961968121ed7eae8c..533852eb87786d5ecd929b7bbade897df94ee24f 100644 (file)
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -201,14 +201,6 @@ static void cpm_uart_stop_rx(struct uart_port *port)
                clrbits16(&sccp->scc_sccm, UART_SCCM_RX);
 }
 
-/*
- * Enable Modem status interrupts
- */
-static void cpm_uart_enable_ms(struct uart_port *port)
-{
-       pr_debug("CPM uart[%d]:enable ms\n", port->line);
-}
-
 /*
  * Generate a break.
  */
@@ -1122,7 +1114,6 @@ static struct uart_ops cpm_uart_pops = {
        .stop_tx        = cpm_uart_stop_tx,
        .start_tx       = cpm_uart_start_tx,
        .stop_rx        = cpm_uart_stop_rx,
-       .enable_ms      = cpm_uart_enable_ms,
        .break_ctl      = cpm_uart_break_ctl,
        .startup        = cpm_uart_startup,
        .shutdown       = cpm_uart_shutdown,

diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index cdbbc788230aecf37202874b32bbc55d6ff9c7d6..c121f16a973f5e7069fbc334624dd537964a4f53 100644 (file)
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -151,11 +151,6 @@ static void dz_stop_rx(struct uart_port *uport)
        dz_out(dport, DZ_LPR, dport->cflag);
 }
 
-static void dz_enable_ms(struct uart_port *uport)
-{
-       /* nothing to do */
-}
-
 /*
  * ------------------------------------------------------------
  *
@@ -751,7 +746,6 @@ static struct uart_ops dz_ops = {
        .stop_tx        = dz_stop_tx,
        .start_tx       = dz_start_tx,
        .stop_rx        = dz_stop_rx,
-       .enable_ms      = dz_enable_ms,
        .break_ctl      = dz_break_ctl,
        .startup        = dz_startup,
        .shutdown       = dz_shutdown,

diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index 3b0ee9afd76fca32869d2619f62550664f3bb92b..7baa34920dbf723468540957f27a7e0f6c5c5299 100644 (file)
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -185,11 +185,6 @@ static void efm32_uart_stop_rx(struct uart_port *port)
        efm32_uart_write32(efm_port, UARTn_CMD_RXDIS, UARTn_CMD);
 }
 
-static void efm32_uart_enable_ms(struct uart_port *port)
-{
-       /* no handshake lines, no modem status interrupts */
-}
-
 static void efm32_uart_break_ctl(struct uart_port *port, int ctl)
 {
        /* not possible without fiddling with gpios */
@@ -499,7 +494,6 @@ static struct uart_ops efm32_uart_pops = {
        .stop_tx = efm32_uart_stop_tx,
        .start_tx = efm32_uart_start_tx,
        .stop_rx = efm32_uart_stop_rx,
-       .enable_ms = efm32_uart_enable_ms,
        .break_ctl = efm32_uart_break_ctl,
        .startup = efm32_uart_startup,
        .shutdown = efm32_uart_shutdown,

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 49385c86cfba78a21bd9a1d60d669ebbb9297995..c5ad567cab8d94f80c417152a51cf866045574fc 100644 (file)
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -179,10 +179,6 @@ static void lpuart_stop_rx(struct uart_port *port)
        writeb(temp & ~UARTCR2_RE, port->membase + UARTCR2);
 }
 
-static void lpuart_enable_ms(struct uart_port *port)
-{
-}
-
 static void lpuart_copy_rx_to_tty(struct lpuart_port *sport,
                struct tty_port *tty, int count)
 {
@@ -996,7 +992,6 @@ static struct uart_ops lpuart_pops = {
        .stop_tx        = lpuart_stop_tx,
        .start_tx       = lpuart_start_tx,
        .stop_rx        = lpuart_stop_rx,
-       .enable_ms      = lpuart_enable_ms,
        .break_ctl      = lpuart_break_ctl,
        .startup        = lpuart_startup,
        .shutdown       = lpuart_shutdown,

diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 67423805e6d9b0ed761c26958e7cf2df9a31e8f0..d4620fe5da2e43a264b08adbee8111dd12bef2cc 100644 (file)
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1052,11 +1052,6 @@ static void icom_stop_rx(struct uart_port *port)
        writeb(cmdReg & ~CMD_RCV_ENABLE, &ICOM_PORT->dram->CmdReg);
 }
 
-static void icom_enable_ms(struct uart_port *port)
-{
-       /* no-op */
-}
-
 static void icom_break(struct uart_port *port, int break_state)
 {
        unsigned char cmdReg;
@@ -1300,7 +1295,6 @@ static struct uart_ops icom_ops = {
        .start_tx = icom_start_tx,
        .send_xchar = icom_send_xchar,
        .stop_rx = icom_stop_rx,
-       .enable_ms = icom_enable_ms,
        .break_ctl = icom_break,
        .startup = icom_open,
        .shutdown = icom_close,

diff --git a/drivers/tty/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c
index 6e4c715c5d26e102200a8794980ff2391a8c5792..abd7ea26ed9af2e3589d0692f1c205de913de889 100644 (file)
--- a/drivers/tty/serial/ioc3_serial.c
+++ b/drivers/tty/serial/ioc3_serial.c
@@ -1880,7 +1880,6 @@ static struct uart_ops ioc3_ops = {
        .stop_tx = ic3_stop_tx,
        .start_tx = ic3_start_tx,
        .stop_rx = ic3_stop_rx,
-       .enable_ms = null_void_function,
        .break_ctl = ic3_break_ctl,
        .startup = ic3_startup,
        .shutdown = ic3_shutdown,

diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
index 1274499850fc9a0470da7ba6dbabae403a55bbb0..aa28209f44c1919c92fb2138dff48ff05a852142 100644 (file)
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
@@ -2597,7 +2597,6 @@ static struct uart_ops ioc4_ops = {
        .stop_tx        = ic4_stop_tx,
        .start_tx       = ic4_start_tx,
        .stop_rx        = null_void_function,
-       .enable_ms      = null_void_function,
        .break_ctl      = ic4_break_ctl,
        .startup        = ic4_startup,
        .shutdown       = ic4_shutdown,

diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
index 27bb75070c965867efb6f04a4345322d399c8ca5..3e5c1563afe2065749696c4405a8f3d598b60651 100644 (file)
--- a/drivers/tty/serial/jsm/jsm_tty.c
+++ b/drivers/tty/serial/jsm/jsm_tty.c
@@ -177,11 +177,6 @@ static void jsm_tty_stop_rx(struct uart_port *port)
        channel->ch_bd->bd_ops->disable_receiver(channel);
 }
 
-static void jsm_tty_enable_ms(struct uart_port *port)
-{
-       /* Nothing needed */
-}
-
 static void jsm_tty_break(struct uart_port *port, int break_state)
 {
        unsigned long lock_flags;
@@ -354,7 +349,6 @@ static struct uart_ops jsm_ops = {
        .start_tx       = jsm_tty_start_tx,
        .send_xchar     = jsm_tty_send_xchar,
        .stop_rx        = jsm_tty_stop_rx,
-       .enable_ms      = jsm_tty_enable_ms,
        .break_ctl      = jsm_tty_break,
        .startup        = jsm_tty_open,
        .shutdown       = jsm_tty_close,

diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 88d01e0bb0c8e34122e0ab7c0f26d1e48b78bd13..ea030830cfa2902e00b32aa5cf603cffc4887891 100644 (file)
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
@@ -154,11 +154,6 @@ lqasc_stop_rx(struct uart_port *port)
        ltq_w32(ASCWHBSTATE_CLRREN, port->membase + LTQ_ASC_WHBSTATE);
 }
 
-static void
-lqasc_enable_ms(struct uart_port *port)
-{
-}
-
 static int
 lqasc_rx_chars(struct uart_port *port)
 {
@@ -568,7 +563,6 @@ static struct uart_ops lqasc_pops = {
        .stop_tx =      lqasc_stop_tx,
        .start_tx =     lqasc_start_tx,
        .stop_rx =      lqasc_stop_rx,
-       .enable_ms =    lqasc_enable_ms,
        .break_ctl =    lqasc_break_ctl,
        .startup =      lqasc_startup,
        .shutdown =     lqasc_shutdown,

diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index 701644f06820db0a9dbe052d560a0d1bf3f342be..6f0f89282847eae9c4fb14a7d80da1d5cd86edfa 100644 (file)
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -427,12 +427,6 @@ static void serial_lpc32xx_stop_rx(struct uart_port *port)
                LPC32XX_HSU_FE_INT), LPC32XX_HSUART_IIR(port->membase));
 }
 
-/* port->lock held by caller.  */
-static void serial_lpc32xx_enable_ms(struct uart_port *port)
-{
-       /* Modem status is not supported */
-}
-
 /* port->lock is not held.  */
 static void serial_lpc32xx_break_ctl(struct uart_port *port,
                                     int break_state)
@@ -658,7 +652,6 @@ static struct uart_ops serial_lpc32xx_pops = {
        .stop_tx        = serial_lpc32xx_stop_tx,
        .start_tx       = serial_lpc32xx_start_tx,
        .stop_rx        = serial_lpc32xx_stop_rx,
-       .enable_ms      = serial_lpc32xx_enable_ms,
        .break_ctl      = serial_lpc32xx_break_ctl,
        .startup        = serial_lpc32xx_startup,
        .shutdown       = serial_lpc32xx_shutdown,

diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index ba285cd45b59f50c3ca4716895a784e0f30e4a12..82573dc4d8cf8ebf99d84d40056d5fb5dac85303 100644 (file)
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1008,7 +1008,6 @@ static const struct uart_ops max310x_ops = {
        .stop_tx        = max310x_null_void,
        .start_tx       = max310x_start_tx,
        .stop_rx        = max310x_null_void,
-       .enable_ms      = max310x_null_void,
        .break_ctl      = max310x_break_ctl,
        .startup        = max310x_startup,
        .shutdown       = max310x_shutdown,

diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index a6f085717f94434e9cf5a06dc0e10e7b47ee7ba4..fab4d6ad16ef75c6a0aa3e570f420117a17a7ab5 100644 (file)
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -150,12 +150,6 @@ static void mcf_break_ctl(struct uart_port *port, int break_state)
 
 /****************************************************************************/
 
-static void mcf_enable_ms(struct uart_port *port)
-{
-}
-
-/****************************************************************************/
-
 static int mcf_startup(struct uart_port *port)
 {
        struct mcf_uart *pp = container_of(port, struct mcf_uart, port);
@@ -507,7 +501,6 @@ static const struct uart_ops mcf_uart_ops = {
        .start_tx       = mcf_start_tx,
        .stop_tx        = mcf_stop_tx,
        .stop_rx        = mcf_stop_rx,
-       .enable_ms      = mcf_enable_ms,
        .break_ctl      = mcf_break_ctl,
        .startup        = mcf_startup,
        .shutdown       = mcf_shutdown,

diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c
index 759c6a6fa74a014900109d5eca12915105d0bc9b..ae49856ef6c7193111774f4a61e66a94a95cf462 100644 (file)
--- a/drivers/tty/serial/mpsc.c
+++ b/drivers/tty/serial/mpsc.c
@@ -1336,10 +1336,6 @@ static void mpsc_stop_rx(struct uart_port *port)
        mpsc_sdma_cmd(pi, SDMA_SDCM_AR);
 }
 
-static void mpsc_enable_ms(struct uart_port *port)
-{
-}
-
 static void mpsc_break_ctl(struct uart_port *port, int ctl)
 {
        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
@@ -1674,7 +1670,6 @@ static struct uart_ops mpsc_pops = {
        .stop_tx        = mpsc_stop_tx,
        .start_tx       = mpsc_start_tx,
        .stop_rx        = mpsc_stop_rx,
-       .enable_ms      = mpsc_enable_ms,
        .break_ctl      = mpsc_break_ctl,
        .startup        = mpsc_startup,
        .shutdown       = mpsc_shutdown,

diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index db0448ae59dc85557d7a4b2c16903a602c37f2e5..1504a14ec1a6aa2a60a3ec00949607e2587ecd43 100644 (file)
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -698,10 +698,6 @@ static void serial_m3110_pm(struct uart_port *port, unsigned int state,
 {
 }
 
-static void serial_m3110_enable_ms(struct uart_port *port)
-{
-}
-
 static struct uart_ops serial_m3110_ops = {
        .tx_empty       = serial_m3110_tx_empty,
        .set_mctrl      = serial_m3110_set_mctrl,
@@ -709,7 +705,6 @@ static struct uart_ops serial_m3110_ops = {
        .stop_tx        = serial_m3110_stop_tx,
        .start_tx       = serial_m3110_start_tx,
        .stop_rx        = serial_m3110_stop_rx,
-       .enable_ms      = serial_m3110_enable_ms,
        .break_ctl      = serial_m3110_break_ctl,
        .startup        = serial_m3110_startup,
        .shutdown       = serial_m3110_shutdown,

diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index be127d0da32ce3c10e01978726071d240452833e..dd26511ad8754fa171114c96c18fdd01e4e66d73 100644 (file)
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -168,16 +168,6 @@ static void mux_stop_rx(struct uart_port *port)
 {
 }
 
-/**
- * mux_enable_ms - Enable modum status interrupts.
- * @port: Ptr to the uart_port.
- *
- * The Serial Mux does not support this function.
- */
-static void mux_enable_ms(struct uart_port *port)
-{
-}
-
 /**
  * mux_break_ctl - Control the transmitssion of a break signal.
  * @port: Ptr to the uart_port.
@@ -449,7 +439,6 @@ static struct uart_ops mux_pops = {
        .stop_tx =              mux_stop_tx,
        .start_tx =             mux_start_tx,
        .stop_rx =              mux_stop_rx,
-       .enable_ms =            mux_enable_ms,
        .break_ctl =            mux_break_ctl,
        .startup =              mux_startup,
        .shutdown =             mux_shutdown,

diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 86de4477d98afd62cb77b42b70978fddbfb62a3e..b5c329248c810c07d2bb84beacc7b608b8248545 100644 (file)
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -815,17 +815,11 @@ static void mxs_auart_break_ctl(struct uart_port *u, int ctl)
                             u->membase + AUART_LINECTRL_CLR);
 }
 
-static void mxs_auart_enable_ms(struct uart_port *port)
-{
-       /* just empty */
-}
-
 static struct uart_ops mxs_auart_ops = {
        .tx_empty       = mxs_auart_tx_empty,
        .start_tx       = mxs_auart_start_tx,
        .stop_tx        = mxs_auart_stop_tx,
        .stop_rx        = mxs_auart_stop_rx,
-       .enable_ms      = mxs_auart_enable_ms,
        .break_ctl      = mxs_auart_break_ctl,
        .set_mctrl      = mxs_auart_set_mctrl,
        .get_mctrl      = mxs_auart_get_mctrl,

diff --git a/drivers/tty/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c
index 693bc6c2561ec5460818e098b0bc286b1786cfb7..c06366b6bc29f461f324f8494c0cdfb45032c876 100644 (file)
--- a/drivers/tty/serial/nwpserial.c
+++ b/drivers/tty/serial/nwpserial.c
@@ -240,11 +240,6 @@ static void nwpserial_break_ctl(struct uart_port *port, int ctl)
        /* N/A */
 }
 
-static void nwpserial_enable_ms(struct uart_port *port)
-{
-       /* N/A */
-}
-
 static void nwpserial_stop_rx(struct uart_port *port)
 {
        struct nwpserial_port *up;
@@ -315,7 +310,6 @@ static struct uart_ops nwpserial_pops = {
        .stop_tx      = nwpserial_stop_tx,
        .start_tx     = nwpserial_start_tx,
        .stop_rx      = nwpserial_stop_rx,
-       .enable_ms    = nwpserial_enable_ms,
        .break_ctl    = nwpserial_break_ctl,
        .startup      = nwpserial_startup,
        .shutdown     = nwpserial_shutdown,

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 7793b16b6877e5dc89fcf999b0f3b2d22afbae8c..eadab074e7c9fbabced87b3248350cb05741c941 100644 (file)
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -203,10 +203,6 @@ static void s3c24xx_serial_stop_rx(struct uart_port *port)
        }
 }
 
-static void s3c24xx_serial_enable_ms(struct uart_port *port)
-{
-}
-
 static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *port)
 {
        return to_ourport(port)->info;
@@ -952,7 +948,6 @@ static struct uart_ops s3c24xx_serial_ops = {
        .stop_tx        = s3c24xx_serial_stop_tx,
        .start_tx       = s3c24xx_serial_start_tx,
        .stop_rx        = s3c24xx_serial_stop_rx,
-       .enable_ms      = s3c24xx_serial_enable_ms,
        .break_ctl      = s3c24xx_serial_break_ctl,
        .startup        = s3c24xx_serial_startup,
        .shutdown       = s3c24xx_serial_shutdown,

diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 1b6a77c4b2cb8f6fd232607325093aa2a90f3e43..914825e034273d7bc2676a73f608399e9dc2ac20 100644 (file)
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -991,7 +991,6 @@ static const struct uart_ops sc16is7xx_ops = {
        .stop_tx        = sc16is7xx_stop_tx,
        .start_tx       = sc16is7xx_start_tx,
        .stop_rx        = sc16is7xx_stop_rx,
-       .enable_ms      = sc16is7xx_null_void,
        .break_ctl      = sc16is7xx_break_ctl,
        .startup        = sc16is7xx_startup,
        .shutdown       = sc16is7xx_shutdown,

diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index e84b6a3bdd18dc9483d82aaf84cca017e1629c01..75850f70b4796eb9663edc355a8dca57d93faad6 100644 (file)
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -533,11 +533,6 @@ static unsigned int sccnxp_tx_empty(struct uart_port *port)
        return (val & SR_TXEMT) ? TIOCSER_TEMT : 0;
 }
 
-static void sccnxp_enable_ms(struct uart_port *port)
-{
-       /* Do nothing */
-}
-
 static void sccnxp_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
        struct sccnxp_port *s = dev_get_drvdata(port->dev);
@@ -790,7 +785,6 @@ static const struct uart_ops sccnxp_ops = {
        .stop_tx        = sccnxp_stop_tx,
        .start_tx       = sccnxp_start_tx,
        .stop_rx        = sccnxp_stop_rx,
-       .enable_ms      = sccnxp_enable_ms,
        .break_ctl      = sccnxp_break_ctl,
        .startup        = sccnxp_startup,
        .shutdown       = sccnxp_shutdown,

diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index ea8546092c7e10b5828be5dfccaa0f2361e8f7de..29f5232f79e4b6c8198ec5e8cd76cafbedc1b8bd 100644 (file)
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -244,11 +244,6 @@ static void serial_txx9_stop_rx(struct uart_port *port)
        up->port.read_status_mask &= ~TXX9_SIDISR_RDIS;
 }
 
-static void serial_txx9_enable_ms(struct uart_port *port)
-{
-       /* TXX9-SIO can not control DTR... */
-}
-
 static void serial_txx9_initialize(struct uart_port *port)
 {
        struct uart_txx9_port *up = to_uart_txx9_port(port);
@@ -858,7 +853,6 @@ static struct uart_ops serial_txx9_pops = {
        .stop_tx        = serial_txx9_stop_tx,
        .start_tx       = serial_txx9_start_tx,
        .stop_rx        = serial_txx9_stop_rx,
-       .enable_ms      = serial_txx9_enable_ms,
        .break_ctl      = serial_txx9_break_ctl,
        .startup        = serial_txx9_startup,
        .shutdown       = serial_txx9_shutdown,

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 88236da0ddf731ae13d0701448497595e389ef62..26dad3e87b5249e87a1d473d9f0f2ae44e89dfa2 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1560,13 +1560,6 @@ static void sci_stop_rx(struct uart_port *port)
        serial_port_out(port, SCSCR, ctrl);
 }
 
-static void sci_enable_ms(struct uart_port *port)
-{
-       /*
-        * Not supported by hardware, always a nop.
-        */
-}
-
 static void sci_break_ctl(struct uart_port *port, int break_state)
 {
        struct sci_port *s = to_sci_port(port);
@@ -2080,7 +2073,6 @@ static struct uart_ops sci_uart_ops = {
        .start_tx       = sci_start_tx,
        .stop_tx        = sci_stop_tx,
        .stop_rx        = sci_stop_rx,
-       .enable_ms      = sci_enable_ms,
        .break_ctl      = sci_break_ctl,
        .startup        = sci_startup,
        .shutdown       = sci_shutdown,

diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index f51ffdc696fd4f753aff688e5e8d0fb8e0e07779..33e94e56dcdb085aef32e290222ac9d0f200c689 100644 (file)
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -274,15 +274,6 @@ static void snp_release_port(struct uart_port *port)
 {
 }
 
-/**
- * snp_enable_ms - Force modem status interrupts on - no-op for us
- * @port: Port to operate on - we ignore - no-op function
- *
- */
-static void snp_enable_ms(struct uart_port *port)
-{
-}
-
 /**
  * snp_shutdown - shut down the port - free irq and disable - no-op for us
  * @port: Port to shut down - we ignore
@@ -396,7 +387,6 @@ static struct uart_ops sn_console_ops = {
        .stop_tx = snp_stop_tx,
        .start_tx = snp_start_tx,
        .stop_rx = snp_stop_rx,
-       .enable_ms = snp_enable_ms,
        .break_ctl = snp_break_ctl,
        .startup = snp_startup,
        .shutdown = snp_shutdown,

diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index f48b1cc07eeac3f37a8d3641cb8c37bdefa27521..2bee4fbccba18c74ec79997aa2db8eabc85faf4e 100644 (file)
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -411,12 +411,6 @@ static void asc_stop_rx(struct uart_port *port)
        asc_disable_rx_interrupts(port);
 }
 
-/* Force modem status interrupts on */
-static void asc_enable_ms(struct uart_port *port)
-{
-       /* Nothing here yet .. */
-}
-
 /* Handle breaks - ignored by us */
 static void asc_break_ctl(struct uart_port *port, int break_state)
 {
@@ -644,7 +638,6 @@ static struct uart_ops asc_uart_ops = {
        .start_tx       = asc_start_tx,
        .stop_tx        = asc_stop_tx,
        .stop_rx        = asc_stop_rx,
-       .enable_ms      = asc_enable_ms,
        .break_ctl      = asc_break_ctl,
        .startup        = asc_startup,
        .shutdown       = asc_shutdown,

diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index dc697cee248ad3dcfa84e2f1d66f8c439b37dd81..20521db2189fbe3fcebd1e2583bb80b946d87f5e 100644 (file)
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -285,11 +285,6 @@ static void sunhv_stop_rx(struct uart_port *port)
 {
 }
 
-/* port->lock held by caller.  */
-static void sunhv_enable_ms(struct uart_port *port)
-{
-}
-
 /* port->lock is not held.  */
 static void sunhv_break_ctl(struct uart_port *port, int break_state)
 {
@@ -379,7 +374,6 @@ static struct uart_ops sunhv_pops = {
        .start_tx       = sunhv_start_tx,
        .send_xchar     = sunhv_send_xchar,
        .stop_rx        = sunhv_stop_rx,
-       .enable_ms      = sunhv_enable_ms,
        .break_ctl      = sunhv_break_ctl,
        .startup        = sunhv_startup,
        .shutdown       = sunhv_shutdown,

diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index 80a58eca785ba0a75857b7b851596d41244051c5..c9751d8b24c10bc7d34e0527f5f51fb2d3d529f0 100644 (file)
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -473,12 +473,6 @@ static void sunsab_stop_rx(struct uart_port *port)
        writeb(up->interrupt_mask1, &up->regs->w.imr0);
 }
 
-/* port->lock held by caller.  */
-static void sunsab_enable_ms(struct uart_port *port)
-{
-       /* For now we always receive these interrupts.  */
-}
-
 /* port->lock is not held.  */
 static void sunsab_break_ctl(struct uart_port *port, int break_state)
 {
@@ -807,7 +801,6 @@ static struct uart_ops sunsab_pops = {
        .start_tx       = sunsab_start_tx,
        .send_xchar     = sunsab_send_xchar,
        .stop_rx        = sunsab_stop_rx,
-       .enable_ms      = sunsab_enable_ms,
        .break_ctl      = sunsab_break_ctl,
        .startup        = sunsab_startup,
        .shutdown       = sunsab_shutdown,

diff --git a/drivers/tty/serial/tilegx.c b/drivers/tty/serial/tilegx.c
index 613ccf09dc2a224e03e55ea951ed06d8d2bc31b0..453215f5420d351127bf5ba837ba240b823db559 100644 (file)
--- a/drivers/tty/serial/tilegx.c
+++ b/drivers/tty/serial/tilegx.c
@@ -314,15 +314,6 @@ static void tilegx_stop_rx(struct uart_port *port)
        mutex_unlock(&tile_uart->mutex);
 }
 
-
-/*
- * Enable modem status interrupts.
- */
-static void tilegx_enable_ms(struct uart_port *port)
-{
-       /* N/A */
-}
-
 /*
  * Control the transmission of a break signal.
  */
@@ -614,7 +605,6 @@ static const struct uart_ops tilegx_ops = {
        .stop_tx        = tilegx_stop_tx,
        .start_tx       = tilegx_start_tx,
        .stop_rx        = tilegx_stop_rx,
-       .enable_ms      = tilegx_enable_ms,
        .break_ctl      = tilegx_break_ctl,
        .startup        = tilegx_startup,
        .shutdown       = tilegx_shutdown,

diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index f87097acd8abc4c732d8d11f8808eadf49d1ce6b..0d11d5032b938e4df90522717b08e6d4fd3e8ab1 100644 (file)
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -244,11 +244,6 @@ static void timbuart_mctrl_check(struct uart_port *port, u32 isr, u32 *ier)
        *ier |= CTS_DELTA;
 }
 
-static void timbuart_enable_ms(struct uart_port *port)
-{
-       /* N/A */
-}
-
 static void timbuart_break_ctl(struct uart_port *port, int ctl)
 {
        /* N/A */
@@ -405,7 +400,6 @@ static struct uart_ops timbuart_ops = {
        .start_tx = timbuart_start_tx,
        .flush_buffer = timbuart_flush_buffer,
        .stop_rx = timbuart_stop_rx,
-       .enable_ms = timbuart_enable_ms,
        .break_ctl = timbuart_break_ctl,
        .startup = timbuart_startup,
        .shutdown = timbuart_shutdown,

diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index dce27f34937e0960fd92cecf24105976050a0003..9fc22f40796ec4b7f71f12bcea4d69c0247696a4 100644 (file)
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -250,11 +250,6 @@ static void ulite_stop_rx(struct uart_port *port)
                | ULITE_STATUS_FRAME | ULITE_STATUS_OVERRUN;
 }
 
-static void ulite_enable_ms(struct uart_port *port)
-{
-       /* N/A */
-}
-
 static void ulite_break_ctl(struct uart_port *port, int ctl)
 {
        /* N/A */
@@ -395,7 +390,6 @@ static struct uart_ops ulite_ops = {
        .stop_tx        = ulite_stop_tx,
        .start_tx       = ulite_start_tx,
        .stop_rx        = ulite_stop_rx,
-       .enable_ms      = ulite_enable_ms,
        .break_ctl      = ulite_break_ctl,
        .startup        = ulite_startup,
        .shutdown       = ulite_shutdown,

diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 1c52074c38dfb3ed6b5849123e45251ca11b06c1..c107a0f0e72f05e8e70fda3e7474bd14efa66f57 100644 (file)
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -435,16 +435,6 @@ static void qe_uart_stop_rx(struct uart_port *port)
        clrbits16(&qe_port->uccp->uccm, UCC_UART_UCCE_RX);
 }
 
-/*
- * Enable status change interrupts
- *
- * We don't support status change interrupts, but we need to define this
- * function otherwise the kernel will panic.
- */
-static void qe_uart_enable_ms(struct uart_port *port)
-{
-}
-
 /* Start or stop sending  break signal
  *
  * This function controls the sending of a break signal.  If break_state=1,
@@ -1102,7 +1092,6 @@ static struct uart_ops qe_uart_pops = {
        .stop_tx        = qe_uart_stop_tx,
        .start_tx       = qe_uart_start_tx,
        .stop_rx        = qe_uart_stop_rx,
-       .enable_ms      = qe_uart_enable_ms,
        .break_ctl      = qe_uart_break_ctl,
        .startup        = qe_uart_startup,
        .shutdown       = qe_uart_shutdown,

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 8809775e2ba30c5d53aa5108a75f3f67aa8e0640..01951d27cc03c8a4801dd66083c9a90c079b0332 100644 (file)
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -918,11 +918,6 @@ static void cdns_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
        /* N/A */
 }
 
-static void cdns_uart_enable_ms(struct uart_port *port)
-{
-       /* N/A */
-}
-
 #ifdef CONFIG_CONSOLE_POLL
 static int cdns_uart_poll_get_char(struct uart_port *port)
 {
@@ -974,7 +969,6 @@ static void cdns_uart_poll_put_char(struct uart_port *port, unsigned char c)
 static struct uart_ops cdns_uart_ops = {
        .set_mctrl      = cdns_uart_set_mctrl,
        .get_mctrl      = cdns_uart_get_mctrl,
-       .enable_ms      = cdns_uart_enable_ms,
        .start_tx       = cdns_uart_start_tx,
        .stop_tx        = cdns_uart_stop_tx,
        .stop_rx        = cdns_uart_stop_rx,