diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2014-06-03 10:54:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 20:29:38 -0400 |
commit | 8b152f1096975d012f60387b899d407e4a93b46c (patch) | |
tree | f100c4a636bb2e9f4a0443400965a6ed87bbcbda /drivers | |
parent | 1fdc31065fdf95ded3b1960d1426e1da43b297ef (diff) |
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>
Diffstat (limited to 'drivers')
40 files changed, 0 insertions, 239 deletions
diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c index c7e8b60b6177..9b208bd686e6 100644 --- 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) | |||
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | static void serial21285_enable_ms(struct uart_port *port) | ||
82 | { | ||
83 | } | ||
84 | |||
85 | static irqreturn_t serial21285_rx_chars(int irq, void *dev_id) | 81 | static irqreturn_t serial21285_rx_chars(int irq, void *dev_id) |
86 | { | 82 | { |
87 | struct uart_port *port = dev_id; | 83 | struct uart_port *port = dev_id; |
@@ -345,7 +341,6 @@ static struct uart_ops serial21285_ops = { | |||
345 | .stop_tx = serial21285_stop_tx, | 341 | .stop_tx = serial21285_stop_tx, |
346 | .start_tx = serial21285_start_tx, | 342 | .start_tx = serial21285_start_tx, |
347 | .stop_rx = serial21285_stop_rx, | 343 | .stop_rx = serial21285_stop_rx, |
348 | .enable_ms = serial21285_enable_ms, | ||
349 | .break_ctl = serial21285_break_ctl, | 344 | .break_ctl = serial21285_break_ctl, |
350 | .startup = serial21285_startup, | 345 | .startup = serial21285_startup, |
351 | .shutdown = serial21285_shutdown, | 346 | .shutdown = serial21285_shutdown, |
diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c index 59b3da9bcc3f..e7d1aaf07294 100644 --- 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) | |||
109 | { | 109 | { |
110 | } | 110 | } |
111 | 111 | ||
112 | static void altera_jtaguart_enable_ms(struct uart_port *port) | ||
113 | { | ||
114 | } | ||
115 | |||
116 | static void altera_jtaguart_set_termios(struct uart_port *port, | 112 | static void altera_jtaguart_set_termios(struct uart_port *port, |
117 | struct ktermios *termios, | 113 | struct ktermios *termios, |
118 | struct ktermios *old) | 114 | struct ktermios *old) |
@@ -291,7 +287,6 @@ static struct uart_ops altera_jtaguart_ops = { | |||
291 | .start_tx = altera_jtaguart_start_tx, | 287 | .start_tx = altera_jtaguart_start_tx, |
292 | .stop_tx = altera_jtaguart_stop_tx, | 288 | .stop_tx = altera_jtaguart_stop_tx, |
293 | .stop_rx = altera_jtaguart_stop_rx, | 289 | .stop_rx = altera_jtaguart_stop_rx, |
294 | .enable_ms = altera_jtaguart_enable_ms, | ||
295 | .break_ctl = altera_jtaguart_break_ctl, | 290 | .break_ctl = altera_jtaguart_break_ctl, |
296 | .startup = altera_jtaguart_startup, | 291 | .startup = altera_jtaguart_startup, |
297 | .shutdown = altera_jtaguart_shutdown, | 292 | .shutdown = altera_jtaguart_shutdown, |
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c index 323376668b72..4c1eae93110c 100644 --- 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) | |||
163 | spin_unlock_irqrestore(&port->lock, flags); | 163 | spin_unlock_irqrestore(&port->lock, flags); |
164 | } | 164 | } |
165 | 165 | ||
166 | static void altera_uart_enable_ms(struct uart_port *port) | ||
167 | { | ||
168 | } | ||
169 | |||
170 | static void altera_uart_set_termios(struct uart_port *port, | 166 | static void altera_uart_set_termios(struct uart_port *port, |
171 | struct ktermios *termios, | 167 | struct ktermios *termios, |
172 | struct ktermios *old) | 168 | struct ktermios *old) |
@@ -415,7 +411,6 @@ static struct uart_ops altera_uart_ops = { | |||
415 | .start_tx = altera_uart_start_tx, | 411 | .start_tx = altera_uart_start_tx, |
416 | .stop_tx = altera_uart_stop_tx, | 412 | .stop_tx = altera_uart_stop_tx, |
417 | .stop_rx = altera_uart_stop_rx, | 413 | .stop_rx = altera_uart_stop_rx, |
418 | .enable_ms = altera_uart_enable_ms, | ||
419 | .break_ctl = altera_uart_break_ctl, | 414 | .break_ctl = altera_uart_break_ctl, |
420 | .startup = altera_uart_startup, | 415 | .startup = altera_uart_startup, |
421 | .shutdown = altera_uart_shutdown, | 416 | .shutdown = altera_uart_shutdown, |
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c index de11ab8ffd91..a34a0cec1685 100644 --- 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) | |||
71 | UART_PUT_CTRL(port, cr); | 71 | UART_PUT_CTRL(port, cr); |
72 | } | 72 | } |
73 | 73 | ||
74 | static void apbuart_enable_ms(struct uart_port *port) | ||
75 | { | ||
76 | /* No modem status change interrupts for APBUART */ | ||
77 | } | ||
78 | |||
79 | static void apbuart_rx_chars(struct uart_port *port) | 74 | static void apbuart_rx_chars(struct uart_port *port) |
80 | { | 75 | { |
81 | unsigned int status, ch, rsr, flag; | 76 | unsigned int status, ch, rsr, flag; |
@@ -337,7 +332,6 @@ static struct uart_ops grlib_apbuart_ops = { | |||
337 | .stop_tx = apbuart_stop_tx, | 332 | .stop_tx = apbuart_stop_tx, |
338 | .start_tx = apbuart_start_tx, | 333 | .start_tx = apbuart_start_tx, |
339 | .stop_rx = apbuart_stop_rx, | 334 | .stop_rx = apbuart_stop_rx, |
340 | .enable_ms = apbuart_enable_ms, | ||
341 | .break_ctl = apbuart_break_ctl, | 335 | .break_ctl = apbuart_break_ctl, |
342 | .startup = apbuart_startup, | 336 | .startup = apbuart_startup, |
343 | .shutdown = apbuart_shutdown, | 337 | .shutdown = apbuart_shutdown, |
diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c index acd03af7cd52..0be1c45efd65 100644 --- 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) | |||
176 | spin_unlock_irqrestore(&up->port.lock, flags); | 176 | spin_unlock_irqrestore(&up->port.lock, flags); |
177 | } | 177 | } |
178 | 178 | ||
179 | static void ar933x_uart_enable_ms(struct uart_port *port) | ||
180 | { | ||
181 | } | ||
182 | |||
183 | /* | 179 | /* |
184 | * baudrate = (clk / (scale + 1)) * (step * (1 / 2^17)) | 180 | * baudrate = (clk / (scale + 1)) * (step * (1 / 2^17)) |
185 | */ | 181 | */ |
@@ -495,7 +491,6 @@ static struct uart_ops ar933x_uart_ops = { | |||
495 | .stop_tx = ar933x_uart_stop_tx, | 491 | .stop_tx = ar933x_uart_stop_tx, |
496 | .start_tx = ar933x_uart_start_tx, | 492 | .start_tx = ar933x_uart_start_tx, |
497 | .stop_rx = ar933x_uart_stop_rx, | 493 | .stop_rx = ar933x_uart_stop_rx, |
498 | .enable_ms = ar933x_uart_enable_ms, | ||
499 | .break_ctl = ar933x_uart_break_ctl, | 494 | .break_ctl = ar933x_uart_break_ctl, |
500 | .startup = ar933x_uart_startup, | 495 | .startup = ar933x_uart_startup, |
501 | .shutdown = ar933x_uart_shutdown, | 496 | .shutdown = ar933x_uart_shutdown, |
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c index c9f5c9dcc15c..643658f2b5b2 100644 --- 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) | |||
340 | /* MCR not present */ | 340 | /* MCR not present */ |
341 | } | 341 | } |
342 | 342 | ||
343 | /* Enable Modem Status Interrupts */ | ||
344 | |||
345 | static void arc_serial_enable_ms(struct uart_port *port) | ||
346 | { | ||
347 | /* MSR not present */ | ||
348 | } | ||
349 | |||
350 | static void arc_serial_break_ctl(struct uart_port *port, int break_state) | 343 | static void arc_serial_break_ctl(struct uart_port *port, int break_state) |
351 | { | 344 | { |
352 | /* ARC UART doesn't support sending Break signal */ | 345 | /* ARC UART doesn't support sending Break signal */ |
@@ -510,7 +503,6 @@ static struct uart_ops arc_serial_pops = { | |||
510 | .stop_tx = arc_serial_stop_tx, | 503 | .stop_tx = arc_serial_stop_tx, |
511 | .start_tx = arc_serial_start_tx, | 504 | .start_tx = arc_serial_start_tx, |
512 | .stop_rx = arc_serial_stop_rx, | 505 | .stop_rx = arc_serial_stop_rx, |
513 | .enable_ms = arc_serial_enable_ms, | ||
514 | .break_ctl = arc_serial_break_ctl, | 506 | .break_ctl = arc_serial_break_ctl, |
515 | .startup = arc_serial_startup, | 507 | .startup = arc_serial_startup, |
516 | .shutdown = arc_serial_shutdown, | 508 | .shutdown = arc_serial_shutdown, |
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c index 4f229703328b..1174efa466a6 100644 --- 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) | |||
426 | SSYNC(); | 426 | SSYNC(); |
427 | } | 427 | } |
428 | 428 | ||
429 | static void sport_enable_ms(struct uart_port *port) | ||
430 | { | ||
431 | pr_debug("%s enter\n", __func__); | ||
432 | } | ||
433 | |||
434 | static void sport_break_ctl(struct uart_port *port, int break_state) | 429 | static void sport_break_ctl(struct uart_port *port, int break_state) |
435 | { | 430 | { |
436 | pr_debug("%s enter\n", __func__); | 431 | pr_debug("%s enter\n", __func__); |
@@ -587,7 +582,6 @@ struct uart_ops sport_uart_ops = { | |||
587 | .stop_tx = sport_stop_tx, | 582 | .stop_tx = sport_stop_tx, |
588 | .start_tx = sport_start_tx, | 583 | .start_tx = sport_start_tx, |
589 | .stop_rx = sport_stop_rx, | 584 | .stop_rx = sport_stop_rx, |
590 | .enable_ms = sport_enable_ms, | ||
591 | .break_ctl = sport_break_ctl, | 585 | .break_ctl = sport_break_ctl, |
592 | .startup = sport_startup, | 586 | .startup = sport_startup, |
593 | .shutdown = sport_shutdown, | 587 | .shutdown = sport_shutdown, |
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c index ac86a20992e9..dddc081568f1 100644 --- 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) | |||
200 | UART_CLEAR_IER(uart, ERBFI); | 200 | UART_CLEAR_IER(uart, ERBFI); |
201 | } | 201 | } |
202 | 202 | ||
203 | /* | ||
204 | * Set the modem control timer to fire immediately. | ||
205 | */ | ||
206 | static void bfin_serial_enable_ms(struct uart_port *port) | ||
207 | { | ||
208 | } | ||
209 | |||
210 | |||
211 | #if ANOMALY_05000363 && defined(CONFIG_SERIAL_BFIN_PIO) | 203 | #if ANOMALY_05000363 && defined(CONFIG_SERIAL_BFIN_PIO) |
212 | # define UART_GET_ANOMALY_THRESHOLD(uart) ((uart)->anomaly_threshold) | 204 | # define UART_GET_ANOMALY_THRESHOLD(uart) ((uart)->anomaly_threshold) |
213 | # define UART_SET_ANOMALY_THRESHOLD(uart, v) ((uart)->anomaly_threshold = (v)) | 205 | # define UART_SET_ANOMALY_THRESHOLD(uart, v) ((uart)->anomaly_threshold = (v)) |
@@ -1014,7 +1006,6 @@ static struct uart_ops bfin_serial_pops = { | |||
1014 | .stop_tx = bfin_serial_stop_tx, | 1006 | .stop_tx = bfin_serial_stop_tx, |
1015 | .start_tx = bfin_serial_start_tx, | 1007 | .start_tx = bfin_serial_start_tx, |
1016 | .stop_rx = bfin_serial_stop_rx, | 1008 | .stop_rx = bfin_serial_stop_rx, |
1017 | .enable_ms = bfin_serial_enable_ms, | ||
1018 | .break_ctl = bfin_serial_break_ctl, | 1009 | .break_ctl = bfin_serial_break_ctl, |
1019 | .startup = bfin_serial_startup, | 1010 | .startup = bfin_serial_startup, |
1020 | .shutdown = bfin_serial_shutdown, | 1011 | .shutdown = bfin_serial_shutdown, |
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c index 14aaea0d4131..f5b4c3d7e38f 100644 --- a/drivers/tty/serial/clps711x.c +++ b/drivers/tty/serial/clps711x.c | |||
@@ -352,7 +352,6 @@ static const struct uart_ops uart_clps711x_ops = { | |||
352 | .stop_tx = uart_clps711x_stop_tx, | 352 | .stop_tx = uart_clps711x_stop_tx, |
353 | .start_tx = uart_clps711x_start_tx, | 353 | .start_tx = uart_clps711x_start_tx, |
354 | .stop_rx = uart_clps711x_nop_void, | 354 | .stop_rx = uart_clps711x_nop_void, |
355 | .enable_ms = uart_clps711x_nop_void, | ||
356 | .break_ctl = uart_clps711x_break_ctl, | 355 | .break_ctl = uart_clps711x_break_ctl, |
357 | .set_ldisc = uart_clps711x_set_ldisc, | 356 | .set_ldisc = uart_clps711x_set_ldisc, |
358 | .startup = uart_clps711x_startup, | 357 | .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 aa60e6d13eca..533852eb8778 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c | |||
@@ -202,14 +202,6 @@ static void cpm_uart_stop_rx(struct uart_port *port) | |||
202 | } | 202 | } |
203 | 203 | ||
204 | /* | 204 | /* |
205 | * Enable Modem status interrupts | ||
206 | */ | ||
207 | static void cpm_uart_enable_ms(struct uart_port *port) | ||
208 | { | ||
209 | pr_debug("CPM uart[%d]:enable ms\n", port->line); | ||
210 | } | ||
211 | |||
212 | /* | ||
213 | * Generate a break. | 205 | * Generate a break. |
214 | */ | 206 | */ |
215 | static void cpm_uart_break_ctl(struct uart_port *port, int break_state) | 207 | static void cpm_uart_break_ctl(struct uart_port *port, int break_state) |
@@ -1122,7 +1114,6 @@ static struct uart_ops cpm_uart_pops = { | |||
1122 | .stop_tx = cpm_uart_stop_tx, | 1114 | .stop_tx = cpm_uart_stop_tx, |
1123 | .start_tx = cpm_uart_start_tx, | 1115 | .start_tx = cpm_uart_start_tx, |
1124 | .stop_rx = cpm_uart_stop_rx, | 1116 | .stop_rx = cpm_uart_stop_rx, |
1125 | .enable_ms = cpm_uart_enable_ms, | ||
1126 | .break_ctl = cpm_uart_break_ctl, | 1117 | .break_ctl = cpm_uart_break_ctl, |
1127 | .startup = cpm_uart_startup, | 1118 | .startup = cpm_uart_startup, |
1128 | .shutdown = cpm_uart_shutdown, | 1119 | .shutdown = cpm_uart_shutdown, |
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c index cdbbc788230a..c121f16a973f 100644 --- 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) | |||
151 | dz_out(dport, DZ_LPR, dport->cflag); | 151 | dz_out(dport, DZ_LPR, dport->cflag); |
152 | } | 152 | } |
153 | 153 | ||
154 | static void dz_enable_ms(struct uart_port *uport) | ||
155 | { | ||
156 | /* nothing to do */ | ||
157 | } | ||
158 | |||
159 | /* | 154 | /* |
160 | * ------------------------------------------------------------ | 155 | * ------------------------------------------------------------ |
161 | * | 156 | * |
@@ -751,7 +746,6 @@ static struct uart_ops dz_ops = { | |||
751 | .stop_tx = dz_stop_tx, | 746 | .stop_tx = dz_stop_tx, |
752 | .start_tx = dz_start_tx, | 747 | .start_tx = dz_start_tx, |
753 | .stop_rx = dz_stop_rx, | 748 | .stop_rx = dz_stop_rx, |
754 | .enable_ms = dz_enable_ms, | ||
755 | .break_ctl = dz_break_ctl, | 749 | .break_ctl = dz_break_ctl, |
756 | .startup = dz_startup, | 750 | .startup = dz_startup, |
757 | .shutdown = dz_shutdown, | 751 | .shutdown = dz_shutdown, |
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c index 3b0ee9afd76f..7baa34920dbf 100644 --- 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) | |||
185 | efm32_uart_write32(efm_port, UARTn_CMD_RXDIS, UARTn_CMD); | 185 | efm32_uart_write32(efm_port, UARTn_CMD_RXDIS, UARTn_CMD); |
186 | } | 186 | } |
187 | 187 | ||
188 | static void efm32_uart_enable_ms(struct uart_port *port) | ||
189 | { | ||
190 | /* no handshake lines, no modem status interrupts */ | ||
191 | } | ||
192 | |||
193 | static void efm32_uart_break_ctl(struct uart_port *port, int ctl) | 188 | static void efm32_uart_break_ctl(struct uart_port *port, int ctl) |
194 | { | 189 | { |
195 | /* not possible without fiddling with gpios */ | 190 | /* not possible without fiddling with gpios */ |
@@ -499,7 +494,6 @@ static struct uart_ops efm32_uart_pops = { | |||
499 | .stop_tx = efm32_uart_stop_tx, | 494 | .stop_tx = efm32_uart_stop_tx, |
500 | .start_tx = efm32_uart_start_tx, | 495 | .start_tx = efm32_uart_start_tx, |
501 | .stop_rx = efm32_uart_stop_rx, | 496 | .stop_rx = efm32_uart_stop_rx, |
502 | .enable_ms = efm32_uart_enable_ms, | ||
503 | .break_ctl = efm32_uart_break_ctl, | 497 | .break_ctl = efm32_uart_break_ctl, |
504 | .startup = efm32_uart_startup, | 498 | .startup = efm32_uart_startup, |
505 | .shutdown = efm32_uart_shutdown, | 499 | .shutdown = efm32_uart_shutdown, |
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 49385c86cfba..c5ad567cab8d 100644 --- 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) | |||
179 | writeb(temp & ~UARTCR2_RE, port->membase + UARTCR2); | 179 | writeb(temp & ~UARTCR2_RE, port->membase + UARTCR2); |
180 | } | 180 | } |
181 | 181 | ||
182 | static void lpuart_enable_ms(struct uart_port *port) | ||
183 | { | ||
184 | } | ||
185 | |||
186 | static void lpuart_copy_rx_to_tty(struct lpuart_port *sport, | 182 | static void lpuart_copy_rx_to_tty(struct lpuart_port *sport, |
187 | struct tty_port *tty, int count) | 183 | struct tty_port *tty, int count) |
188 | { | 184 | { |
@@ -996,7 +992,6 @@ static struct uart_ops lpuart_pops = { | |||
996 | .stop_tx = lpuart_stop_tx, | 992 | .stop_tx = lpuart_stop_tx, |
997 | .start_tx = lpuart_start_tx, | 993 | .start_tx = lpuart_start_tx, |
998 | .stop_rx = lpuart_stop_rx, | 994 | .stop_rx = lpuart_stop_rx, |
999 | .enable_ms = lpuart_enable_ms, | ||
1000 | .break_ctl = lpuart_break_ctl, | 995 | .break_ctl = lpuart_break_ctl, |
1001 | .startup = lpuart_startup, | 996 | .startup = lpuart_startup, |
1002 | .shutdown = lpuart_shutdown, | 997 | .shutdown = lpuart_shutdown, |
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index 67423805e6d9..d4620fe5da2e 100644 --- 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) | |||
1052 | writeb(cmdReg & ~CMD_RCV_ENABLE, &ICOM_PORT->dram->CmdReg); | 1052 | writeb(cmdReg & ~CMD_RCV_ENABLE, &ICOM_PORT->dram->CmdReg); |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | static void icom_enable_ms(struct uart_port *port) | ||
1056 | { | ||
1057 | /* no-op */ | ||
1058 | } | ||
1059 | |||
1060 | static void icom_break(struct uart_port *port, int break_state) | 1055 | static void icom_break(struct uart_port *port, int break_state) |
1061 | { | 1056 | { |
1062 | unsigned char cmdReg; | 1057 | unsigned char cmdReg; |
@@ -1300,7 +1295,6 @@ static struct uart_ops icom_ops = { | |||
1300 | .start_tx = icom_start_tx, | 1295 | .start_tx = icom_start_tx, |
1301 | .send_xchar = icom_send_xchar, | 1296 | .send_xchar = icom_send_xchar, |
1302 | .stop_rx = icom_stop_rx, | 1297 | .stop_rx = icom_stop_rx, |
1303 | .enable_ms = icom_enable_ms, | ||
1304 | .break_ctl = icom_break, | 1298 | .break_ctl = icom_break, |
1305 | .startup = icom_open, | 1299 | .startup = icom_open, |
1306 | .shutdown = icom_close, | 1300 | .shutdown = icom_close, |
diff --git a/drivers/tty/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c index 6e4c715c5d26..abd7ea26ed9a 100644 --- a/drivers/tty/serial/ioc3_serial.c +++ b/drivers/tty/serial/ioc3_serial.c | |||
@@ -1880,7 +1880,6 @@ static struct uart_ops ioc3_ops = { | |||
1880 | .stop_tx = ic3_stop_tx, | 1880 | .stop_tx = ic3_stop_tx, |
1881 | .start_tx = ic3_start_tx, | 1881 | .start_tx = ic3_start_tx, |
1882 | .stop_rx = ic3_stop_rx, | 1882 | .stop_rx = ic3_stop_rx, |
1883 | .enable_ms = null_void_function, | ||
1884 | .break_ctl = ic3_break_ctl, | 1883 | .break_ctl = ic3_break_ctl, |
1885 | .startup = ic3_startup, | 1884 | .startup = ic3_startup, |
1886 | .shutdown = ic3_shutdown, | 1885 | .shutdown = ic3_shutdown, |
diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c index 1274499850fc..aa28209f44c1 100644 --- a/drivers/tty/serial/ioc4_serial.c +++ b/drivers/tty/serial/ioc4_serial.c | |||
@@ -2597,7 +2597,6 @@ static struct uart_ops ioc4_ops = { | |||
2597 | .stop_tx = ic4_stop_tx, | 2597 | .stop_tx = ic4_stop_tx, |
2598 | .start_tx = ic4_start_tx, | 2598 | .start_tx = ic4_start_tx, |
2599 | .stop_rx = null_void_function, | 2599 | .stop_rx = null_void_function, |
2600 | .enable_ms = null_void_function, | ||
2601 | .break_ctl = ic4_break_ctl, | 2600 | .break_ctl = ic4_break_ctl, |
2602 | .startup = ic4_startup, | 2601 | .startup = ic4_startup, |
2603 | .shutdown = ic4_shutdown, | 2602 | .shutdown = ic4_shutdown, |
diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c index 27bb75070c96..3e5c1563afe2 100644 --- 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) | |||
177 | channel->ch_bd->bd_ops->disable_receiver(channel); | 177 | channel->ch_bd->bd_ops->disable_receiver(channel); |
178 | } | 178 | } |
179 | 179 | ||
180 | static void jsm_tty_enable_ms(struct uart_port *port) | ||
181 | { | ||
182 | /* Nothing needed */ | ||
183 | } | ||
184 | |||
185 | static void jsm_tty_break(struct uart_port *port, int break_state) | 180 | static void jsm_tty_break(struct uart_port *port, int break_state) |
186 | { | 181 | { |
187 | unsigned long lock_flags; | 182 | unsigned long lock_flags; |
@@ -354,7 +349,6 @@ static struct uart_ops jsm_ops = { | |||
354 | .start_tx = jsm_tty_start_tx, | 349 | .start_tx = jsm_tty_start_tx, |
355 | .send_xchar = jsm_tty_send_xchar, | 350 | .send_xchar = jsm_tty_send_xchar, |
356 | .stop_rx = jsm_tty_stop_rx, | 351 | .stop_rx = jsm_tty_stop_rx, |
357 | .enable_ms = jsm_tty_enable_ms, | ||
358 | .break_ctl = jsm_tty_break, | 352 | .break_ctl = jsm_tty_break, |
359 | .startup = jsm_tty_open, | 353 | .startup = jsm_tty_open, |
360 | .shutdown = jsm_tty_close, | 354 | .shutdown = jsm_tty_close, |
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c index 88d01e0bb0c8..ea030830cfa2 100644 --- a/drivers/tty/serial/lantiq.c +++ b/drivers/tty/serial/lantiq.c | |||
@@ -154,11 +154,6 @@ lqasc_stop_rx(struct uart_port *port) | |||
154 | ltq_w32(ASCWHBSTATE_CLRREN, port->membase + LTQ_ASC_WHBSTATE); | 154 | ltq_w32(ASCWHBSTATE_CLRREN, port->membase + LTQ_ASC_WHBSTATE); |
155 | } | 155 | } |
156 | 156 | ||
157 | static void | ||
158 | lqasc_enable_ms(struct uart_port *port) | ||
159 | { | ||
160 | } | ||
161 | |||
162 | static int | 157 | static int |
163 | lqasc_rx_chars(struct uart_port *port) | 158 | lqasc_rx_chars(struct uart_port *port) |
164 | { | 159 | { |
@@ -568,7 +563,6 @@ static struct uart_ops lqasc_pops = { | |||
568 | .stop_tx = lqasc_stop_tx, | 563 | .stop_tx = lqasc_stop_tx, |
569 | .start_tx = lqasc_start_tx, | 564 | .start_tx = lqasc_start_tx, |
570 | .stop_rx = lqasc_stop_rx, | 565 | .stop_rx = lqasc_stop_rx, |
571 | .enable_ms = lqasc_enable_ms, | ||
572 | .break_ctl = lqasc_break_ctl, | 566 | .break_ctl = lqasc_break_ctl, |
573 | .startup = lqasc_startup, | 567 | .startup = lqasc_startup, |
574 | .shutdown = lqasc_shutdown, | 568 | .shutdown = lqasc_shutdown, |
diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c index 701644f06820..6f0f89282847 100644 --- 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) | |||
427 | LPC32XX_HSU_FE_INT), LPC32XX_HSUART_IIR(port->membase)); | 427 | LPC32XX_HSU_FE_INT), LPC32XX_HSUART_IIR(port->membase)); |
428 | } | 428 | } |
429 | 429 | ||
430 | /* port->lock held by caller. */ | ||
431 | static void serial_lpc32xx_enable_ms(struct uart_port *port) | ||
432 | { | ||
433 | /* Modem status is not supported */ | ||
434 | } | ||
435 | |||
436 | /* port->lock is not held. */ | 430 | /* port->lock is not held. */ |
437 | static void serial_lpc32xx_break_ctl(struct uart_port *port, | 431 | static void serial_lpc32xx_break_ctl(struct uart_port *port, |
438 | int break_state) | 432 | int break_state) |
@@ -658,7 +652,6 @@ static struct uart_ops serial_lpc32xx_pops = { | |||
658 | .stop_tx = serial_lpc32xx_stop_tx, | 652 | .stop_tx = serial_lpc32xx_stop_tx, |
659 | .start_tx = serial_lpc32xx_start_tx, | 653 | .start_tx = serial_lpc32xx_start_tx, |
660 | .stop_rx = serial_lpc32xx_stop_rx, | 654 | .stop_rx = serial_lpc32xx_stop_rx, |
661 | .enable_ms = serial_lpc32xx_enable_ms, | ||
662 | .break_ctl = serial_lpc32xx_break_ctl, | 655 | .break_ctl = serial_lpc32xx_break_ctl, |
663 | .startup = serial_lpc32xx_startup, | 656 | .startup = serial_lpc32xx_startup, |
664 | .shutdown = serial_lpc32xx_shutdown, | 657 | .shutdown = serial_lpc32xx_shutdown, |
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index ba285cd45b59..82573dc4d8cf 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c | |||
@@ -1008,7 +1008,6 @@ static const struct uart_ops max310x_ops = { | |||
1008 | .stop_tx = max310x_null_void, | 1008 | .stop_tx = max310x_null_void, |
1009 | .start_tx = max310x_start_tx, | 1009 | .start_tx = max310x_start_tx, |
1010 | .stop_rx = max310x_null_void, | 1010 | .stop_rx = max310x_null_void, |
1011 | .enable_ms = max310x_null_void, | ||
1012 | .break_ctl = max310x_break_ctl, | 1011 | .break_ctl = max310x_break_ctl, |
1013 | .startup = max310x_startup, | 1012 | .startup = max310x_startup, |
1014 | .shutdown = max310x_shutdown, | 1013 | .shutdown = max310x_shutdown, |
diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c index a6f085717f94..fab4d6ad16ef 100644 --- 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) | |||
150 | 150 | ||
151 | /****************************************************************************/ | 151 | /****************************************************************************/ |
152 | 152 | ||
153 | static void mcf_enable_ms(struct uart_port *port) | ||
154 | { | ||
155 | } | ||
156 | |||
157 | /****************************************************************************/ | ||
158 | |||
159 | static int mcf_startup(struct uart_port *port) | 153 | static int mcf_startup(struct uart_port *port) |
160 | { | 154 | { |
161 | struct mcf_uart *pp = container_of(port, struct mcf_uart, port); | 155 | struct mcf_uart *pp = container_of(port, struct mcf_uart, port); |
@@ -507,7 +501,6 @@ static const struct uart_ops mcf_uart_ops = { | |||
507 | .start_tx = mcf_start_tx, | 501 | .start_tx = mcf_start_tx, |
508 | .stop_tx = mcf_stop_tx, | 502 | .stop_tx = mcf_stop_tx, |
509 | .stop_rx = mcf_stop_rx, | 503 | .stop_rx = mcf_stop_rx, |
510 | .enable_ms = mcf_enable_ms, | ||
511 | .break_ctl = mcf_break_ctl, | 504 | .break_ctl = mcf_break_ctl, |
512 | .startup = mcf_startup, | 505 | .startup = mcf_startup, |
513 | .shutdown = mcf_shutdown, | 506 | .shutdown = mcf_shutdown, |
diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c index 759c6a6fa74a..ae49856ef6c7 100644 --- 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) | |||
1336 | mpsc_sdma_cmd(pi, SDMA_SDCM_AR); | 1336 | mpsc_sdma_cmd(pi, SDMA_SDCM_AR); |
1337 | } | 1337 | } |
1338 | 1338 | ||
1339 | static void mpsc_enable_ms(struct uart_port *port) | ||
1340 | { | ||
1341 | } | ||
1342 | |||
1343 | static void mpsc_break_ctl(struct uart_port *port, int ctl) | 1339 | static void mpsc_break_ctl(struct uart_port *port, int ctl) |
1344 | { | 1340 | { |
1345 | struct mpsc_port_info *pi = (struct mpsc_port_info *)port; | 1341 | struct mpsc_port_info *pi = (struct mpsc_port_info *)port; |
@@ -1674,7 +1670,6 @@ static struct uart_ops mpsc_pops = { | |||
1674 | .stop_tx = mpsc_stop_tx, | 1670 | .stop_tx = mpsc_stop_tx, |
1675 | .start_tx = mpsc_start_tx, | 1671 | .start_tx = mpsc_start_tx, |
1676 | .stop_rx = mpsc_stop_rx, | 1672 | .stop_rx = mpsc_stop_rx, |
1677 | .enable_ms = mpsc_enable_ms, | ||
1678 | .break_ctl = mpsc_break_ctl, | 1673 | .break_ctl = mpsc_break_ctl, |
1679 | .startup = mpsc_startup, | 1674 | .startup = mpsc_startup, |
1680 | .shutdown = mpsc_shutdown, | 1675 | .shutdown = mpsc_shutdown, |
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c index db0448ae59dc..1504a14ec1a6 100644 --- 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, | |||
698 | { | 698 | { |
699 | } | 699 | } |
700 | 700 | ||
701 | static void serial_m3110_enable_ms(struct uart_port *port) | ||
702 | { | ||
703 | } | ||
704 | |||
705 | static struct uart_ops serial_m3110_ops = { | 701 | static struct uart_ops serial_m3110_ops = { |
706 | .tx_empty = serial_m3110_tx_empty, | 702 | .tx_empty = serial_m3110_tx_empty, |
707 | .set_mctrl = serial_m3110_set_mctrl, | 703 | .set_mctrl = serial_m3110_set_mctrl, |
@@ -709,7 +705,6 @@ static struct uart_ops serial_m3110_ops = { | |||
709 | .stop_tx = serial_m3110_stop_tx, | 705 | .stop_tx = serial_m3110_stop_tx, |
710 | .start_tx = serial_m3110_start_tx, | 706 | .start_tx = serial_m3110_start_tx, |
711 | .stop_rx = serial_m3110_stop_rx, | 707 | .stop_rx = serial_m3110_stop_rx, |
712 | .enable_ms = serial_m3110_enable_ms, | ||
713 | .break_ctl = serial_m3110_break_ctl, | 708 | .break_ctl = serial_m3110_break_ctl, |
714 | .startup = serial_m3110_startup, | 709 | .startup = serial_m3110_startup, |
715 | .shutdown = serial_m3110_shutdown, | 710 | .shutdown = serial_m3110_shutdown, |
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c index be127d0da32c..dd26511ad875 100644 --- a/drivers/tty/serial/mux.c +++ b/drivers/tty/serial/mux.c | |||
@@ -169,16 +169,6 @@ static void mux_stop_rx(struct uart_port *port) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | /** | 171 | /** |
172 | * mux_enable_ms - Enable modum status interrupts. | ||
173 | * @port: Ptr to the uart_port. | ||
174 | * | ||
175 | * The Serial Mux does not support this function. | ||
176 | */ | ||
177 | static void mux_enable_ms(struct uart_port *port) | ||
178 | { | ||
179 | } | ||
180 | |||
181 | /** | ||
182 | * mux_break_ctl - Control the transmitssion of a break signal. | 172 | * mux_break_ctl - Control the transmitssion of a break signal. |
183 | * @port: Ptr to the uart_port. | 173 | * @port: Ptr to the uart_port. |
184 | * @break_state: Raise/Lower the break signal. | 174 | * @break_state: Raise/Lower the break signal. |
@@ -449,7 +439,6 @@ static struct uart_ops mux_pops = { | |||
449 | .stop_tx = mux_stop_tx, | 439 | .stop_tx = mux_stop_tx, |
450 | .start_tx = mux_start_tx, | 440 | .start_tx = mux_start_tx, |
451 | .stop_rx = mux_stop_rx, | 441 | .stop_rx = mux_stop_rx, |
452 | .enable_ms = mux_enable_ms, | ||
453 | .break_ctl = mux_break_ctl, | 442 | .break_ctl = mux_break_ctl, |
454 | .startup = mux_startup, | 443 | .startup = mux_startup, |
455 | .shutdown = mux_shutdown, | 444 | .shutdown = mux_shutdown, |
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 86de4477d98a..b5c329248c81 100644 --- 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) | |||
815 | u->membase + AUART_LINECTRL_CLR); | 815 | u->membase + AUART_LINECTRL_CLR); |
816 | } | 816 | } |
817 | 817 | ||
818 | static void mxs_auart_enable_ms(struct uart_port *port) | ||
819 | { | ||
820 | /* just empty */ | ||
821 | } | ||
822 | |||
823 | static struct uart_ops mxs_auart_ops = { | 818 | static struct uart_ops mxs_auart_ops = { |
824 | .tx_empty = mxs_auart_tx_empty, | 819 | .tx_empty = mxs_auart_tx_empty, |
825 | .start_tx = mxs_auart_start_tx, | 820 | .start_tx = mxs_auart_start_tx, |
826 | .stop_tx = mxs_auart_stop_tx, | 821 | .stop_tx = mxs_auart_stop_tx, |
827 | .stop_rx = mxs_auart_stop_rx, | 822 | .stop_rx = mxs_auart_stop_rx, |
828 | .enable_ms = mxs_auart_enable_ms, | ||
829 | .break_ctl = mxs_auart_break_ctl, | 823 | .break_ctl = mxs_auart_break_ctl, |
830 | .set_mctrl = mxs_auart_set_mctrl, | 824 | .set_mctrl = mxs_auart_set_mctrl, |
831 | .get_mctrl = mxs_auart_get_mctrl, | 825 | .get_mctrl = mxs_auart_get_mctrl, |
diff --git a/drivers/tty/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c index 693bc6c2561e..c06366b6bc29 100644 --- 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) | |||
240 | /* N/A */ | 240 | /* N/A */ |
241 | } | 241 | } |
242 | 242 | ||
243 | static void nwpserial_enable_ms(struct uart_port *port) | ||
244 | { | ||
245 | /* N/A */ | ||
246 | } | ||
247 | |||
248 | static void nwpserial_stop_rx(struct uart_port *port) | 243 | static void nwpserial_stop_rx(struct uart_port *port) |
249 | { | 244 | { |
250 | struct nwpserial_port *up; | 245 | struct nwpserial_port *up; |
@@ -315,7 +310,6 @@ static struct uart_ops nwpserial_pops = { | |||
315 | .stop_tx = nwpserial_stop_tx, | 310 | .stop_tx = nwpserial_stop_tx, |
316 | .start_tx = nwpserial_start_tx, | 311 | .start_tx = nwpserial_start_tx, |
317 | .stop_rx = nwpserial_stop_rx, | 312 | .stop_rx = nwpserial_stop_rx, |
318 | .enable_ms = nwpserial_enable_ms, | ||
319 | .break_ctl = nwpserial_break_ctl, | 313 | .break_ctl = nwpserial_break_ctl, |
320 | .startup = nwpserial_startup, | 314 | .startup = nwpserial_startup, |
321 | .shutdown = nwpserial_shutdown, | 315 | .shutdown = nwpserial_shutdown, |
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 7793b16b6877..eadab074e7c9 100644 --- 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) | |||
203 | } | 203 | } |
204 | } | 204 | } |
205 | 205 | ||
206 | static void s3c24xx_serial_enable_ms(struct uart_port *port) | ||
207 | { | ||
208 | } | ||
209 | |||
210 | static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *port) | 206 | static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *port) |
211 | { | 207 | { |
212 | return to_ourport(port)->info; | 208 | return to_ourport(port)->info; |
@@ -952,7 +948,6 @@ static struct uart_ops s3c24xx_serial_ops = { | |||
952 | .stop_tx = s3c24xx_serial_stop_tx, | 948 | .stop_tx = s3c24xx_serial_stop_tx, |
953 | .start_tx = s3c24xx_serial_start_tx, | 949 | .start_tx = s3c24xx_serial_start_tx, |
954 | .stop_rx = s3c24xx_serial_stop_rx, | 950 | .stop_rx = s3c24xx_serial_stop_rx, |
955 | .enable_ms = s3c24xx_serial_enable_ms, | ||
956 | .break_ctl = s3c24xx_serial_break_ctl, | 951 | .break_ctl = s3c24xx_serial_break_ctl, |
957 | .startup = s3c24xx_serial_startup, | 952 | .startup = s3c24xx_serial_startup, |
958 | .shutdown = s3c24xx_serial_shutdown, | 953 | .shutdown = s3c24xx_serial_shutdown, |
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 1b6a77c4b2cb..914825e03427 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c | |||
@@ -991,7 +991,6 @@ static const struct uart_ops sc16is7xx_ops = { | |||
991 | .stop_tx = sc16is7xx_stop_tx, | 991 | .stop_tx = sc16is7xx_stop_tx, |
992 | .start_tx = sc16is7xx_start_tx, | 992 | .start_tx = sc16is7xx_start_tx, |
993 | .stop_rx = sc16is7xx_stop_rx, | 993 | .stop_rx = sc16is7xx_stop_rx, |
994 | .enable_ms = sc16is7xx_null_void, | ||
995 | .break_ctl = sc16is7xx_break_ctl, | 994 | .break_ctl = sc16is7xx_break_ctl, |
996 | .startup = sc16is7xx_startup, | 995 | .startup = sc16is7xx_startup, |
997 | .shutdown = sc16is7xx_shutdown, | 996 | .shutdown = sc16is7xx_shutdown, |
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index e84b6a3bdd18..75850f70b479 100644 --- 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) | |||
533 | return (val & SR_TXEMT) ? TIOCSER_TEMT : 0; | 533 | return (val & SR_TXEMT) ? TIOCSER_TEMT : 0; |
534 | } | 534 | } |
535 | 535 | ||
536 | static void sccnxp_enable_ms(struct uart_port *port) | ||
537 | { | ||
538 | /* Do nothing */ | ||
539 | } | ||
540 | |||
541 | static void sccnxp_set_mctrl(struct uart_port *port, unsigned int mctrl) | 536 | static void sccnxp_set_mctrl(struct uart_port *port, unsigned int mctrl) |
542 | { | 537 | { |
543 | struct sccnxp_port *s = dev_get_drvdata(port->dev); | 538 | struct sccnxp_port *s = dev_get_drvdata(port->dev); |
@@ -790,7 +785,6 @@ static const struct uart_ops sccnxp_ops = { | |||
790 | .stop_tx = sccnxp_stop_tx, | 785 | .stop_tx = sccnxp_stop_tx, |
791 | .start_tx = sccnxp_start_tx, | 786 | .start_tx = sccnxp_start_tx, |
792 | .stop_rx = sccnxp_stop_rx, | 787 | .stop_rx = sccnxp_stop_rx, |
793 | .enable_ms = sccnxp_enable_ms, | ||
794 | .break_ctl = sccnxp_break_ctl, | 788 | .break_ctl = sccnxp_break_ctl, |
795 | .startup = sccnxp_startup, | 789 | .startup = sccnxp_startup, |
796 | .shutdown = sccnxp_shutdown, | 790 | .shutdown = sccnxp_shutdown, |
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c index ea8546092c7e..29f5232f79e4 100644 --- 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) | |||
244 | up->port.read_status_mask &= ~TXX9_SIDISR_RDIS; | 244 | up->port.read_status_mask &= ~TXX9_SIDISR_RDIS; |
245 | } | 245 | } |
246 | 246 | ||
247 | static void serial_txx9_enable_ms(struct uart_port *port) | ||
248 | { | ||
249 | /* TXX9-SIO can not control DTR... */ | ||
250 | } | ||
251 | |||
252 | static void serial_txx9_initialize(struct uart_port *port) | 247 | static void serial_txx9_initialize(struct uart_port *port) |
253 | { | 248 | { |
254 | struct uart_txx9_port *up = to_uart_txx9_port(port); | 249 | struct uart_txx9_port *up = to_uart_txx9_port(port); |
@@ -858,7 +853,6 @@ static struct uart_ops serial_txx9_pops = { | |||
858 | .stop_tx = serial_txx9_stop_tx, | 853 | .stop_tx = serial_txx9_stop_tx, |
859 | .start_tx = serial_txx9_start_tx, | 854 | .start_tx = serial_txx9_start_tx, |
860 | .stop_rx = serial_txx9_stop_rx, | 855 | .stop_rx = serial_txx9_stop_rx, |
861 | .enable_ms = serial_txx9_enable_ms, | ||
862 | .break_ctl = serial_txx9_break_ctl, | 856 | .break_ctl = serial_txx9_break_ctl, |
863 | .startup = serial_txx9_startup, | 857 | .startup = serial_txx9_startup, |
864 | .shutdown = serial_txx9_shutdown, | 858 | .shutdown = serial_txx9_shutdown, |
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 88236da0ddf7..26dad3e87b52 100644 --- 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) | |||
1560 | serial_port_out(port, SCSCR, ctrl); | 1560 | serial_port_out(port, SCSCR, ctrl); |
1561 | } | 1561 | } |
1562 | 1562 | ||
1563 | static void sci_enable_ms(struct uart_port *port) | ||
1564 | { | ||
1565 | /* | ||
1566 | * Not supported by hardware, always a nop. | ||
1567 | */ | ||
1568 | } | ||
1569 | |||
1570 | static void sci_break_ctl(struct uart_port *port, int break_state) | 1563 | static void sci_break_ctl(struct uart_port *port, int break_state) |
1571 | { | 1564 | { |
1572 | struct sci_port *s = to_sci_port(port); | 1565 | struct sci_port *s = to_sci_port(port); |
@@ -2080,7 +2073,6 @@ static struct uart_ops sci_uart_ops = { | |||
2080 | .start_tx = sci_start_tx, | 2073 | .start_tx = sci_start_tx, |
2081 | .stop_tx = sci_stop_tx, | 2074 | .stop_tx = sci_stop_tx, |
2082 | .stop_rx = sci_stop_rx, | 2075 | .stop_rx = sci_stop_rx, |
2083 | .enable_ms = sci_enable_ms, | ||
2084 | .break_ctl = sci_break_ctl, | 2076 | .break_ctl = sci_break_ctl, |
2085 | .startup = sci_startup, | 2077 | .startup = sci_startup, |
2086 | .shutdown = sci_shutdown, | 2078 | .shutdown = sci_shutdown, |
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c index f51ffdc696fd..33e94e56dcdb 100644 --- a/drivers/tty/serial/sn_console.c +++ b/drivers/tty/serial/sn_console.c | |||
@@ -275,15 +275,6 @@ static void snp_release_port(struct uart_port *port) | |||
275 | } | 275 | } |
276 | 276 | ||
277 | /** | 277 | /** |
278 | * snp_enable_ms - Force modem status interrupts on - no-op for us | ||
279 | * @port: Port to operate on - we ignore - no-op function | ||
280 | * | ||
281 | */ | ||
282 | static void snp_enable_ms(struct uart_port *port) | ||
283 | { | ||
284 | } | ||
285 | |||
286 | /** | ||
287 | * snp_shutdown - shut down the port - free irq and disable - no-op for us | 278 | * snp_shutdown - shut down the port - free irq and disable - no-op for us |
288 | * @port: Port to shut down - we ignore | 279 | * @port: Port to shut down - we ignore |
289 | * | 280 | * |
@@ -396,7 +387,6 @@ static struct uart_ops sn_console_ops = { | |||
396 | .stop_tx = snp_stop_tx, | 387 | .stop_tx = snp_stop_tx, |
397 | .start_tx = snp_start_tx, | 388 | .start_tx = snp_start_tx, |
398 | .stop_rx = snp_stop_rx, | 389 | .stop_rx = snp_stop_rx, |
399 | .enable_ms = snp_enable_ms, | ||
400 | .break_ctl = snp_break_ctl, | 390 | .break_ctl = snp_break_ctl, |
401 | .startup = snp_startup, | 391 | .startup = snp_startup, |
402 | .shutdown = snp_shutdown, | 392 | .shutdown = snp_shutdown, |
diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c index f48b1cc07eea..2bee4fbccba1 100644 --- 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) | |||
411 | asc_disable_rx_interrupts(port); | 411 | asc_disable_rx_interrupts(port); |
412 | } | 412 | } |
413 | 413 | ||
414 | /* Force modem status interrupts on */ | ||
415 | static void asc_enable_ms(struct uart_port *port) | ||
416 | { | ||
417 | /* Nothing here yet .. */ | ||
418 | } | ||
419 | |||
420 | /* Handle breaks - ignored by us */ | 414 | /* Handle breaks - ignored by us */ |
421 | static void asc_break_ctl(struct uart_port *port, int break_state) | 415 | static void asc_break_ctl(struct uart_port *port, int break_state) |
422 | { | 416 | { |
@@ -644,7 +638,6 @@ static struct uart_ops asc_uart_ops = { | |||
644 | .start_tx = asc_start_tx, | 638 | .start_tx = asc_start_tx, |
645 | .stop_tx = asc_stop_tx, | 639 | .stop_tx = asc_stop_tx, |
646 | .stop_rx = asc_stop_rx, | 640 | .stop_rx = asc_stop_rx, |
647 | .enable_ms = asc_enable_ms, | ||
648 | .break_ctl = asc_break_ctl, | 641 | .break_ctl = asc_break_ctl, |
649 | .startup = asc_startup, | 642 | .startup = asc_startup, |
650 | .shutdown = asc_shutdown, | 643 | .shutdown = asc_shutdown, |
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c index dc697cee248a..20521db2189f 100644 --- 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) | |||
285 | { | 285 | { |
286 | } | 286 | } |
287 | 287 | ||
288 | /* port->lock held by caller. */ | ||
289 | static void sunhv_enable_ms(struct uart_port *port) | ||
290 | { | ||
291 | } | ||
292 | |||
293 | /* port->lock is not held. */ | 288 | /* port->lock is not held. */ |
294 | static void sunhv_break_ctl(struct uart_port *port, int break_state) | 289 | static void sunhv_break_ctl(struct uart_port *port, int break_state) |
295 | { | 290 | { |
@@ -379,7 +374,6 @@ static struct uart_ops sunhv_pops = { | |||
379 | .start_tx = sunhv_start_tx, | 374 | .start_tx = sunhv_start_tx, |
380 | .send_xchar = sunhv_send_xchar, | 375 | .send_xchar = sunhv_send_xchar, |
381 | .stop_rx = sunhv_stop_rx, | 376 | .stop_rx = sunhv_stop_rx, |
382 | .enable_ms = sunhv_enable_ms, | ||
383 | .break_ctl = sunhv_break_ctl, | 377 | .break_ctl = sunhv_break_ctl, |
384 | .startup = sunhv_startup, | 378 | .startup = sunhv_startup, |
385 | .shutdown = sunhv_shutdown, | 379 | .shutdown = sunhv_shutdown, |
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c index 80a58eca785b..c9751d8b24c1 100644 --- 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) | |||
473 | writeb(up->interrupt_mask1, &up->regs->w.imr0); | 473 | writeb(up->interrupt_mask1, &up->regs->w.imr0); |
474 | } | 474 | } |
475 | 475 | ||
476 | /* port->lock held by caller. */ | ||
477 | static void sunsab_enable_ms(struct uart_port *port) | ||
478 | { | ||
479 | /* For now we always receive these interrupts. */ | ||
480 | } | ||
481 | |||
482 | /* port->lock is not held. */ | 476 | /* port->lock is not held. */ |
483 | static void sunsab_break_ctl(struct uart_port *port, int break_state) | 477 | static void sunsab_break_ctl(struct uart_port *port, int break_state) |
484 | { | 478 | { |
@@ -807,7 +801,6 @@ static struct uart_ops sunsab_pops = { | |||
807 | .start_tx = sunsab_start_tx, | 801 | .start_tx = sunsab_start_tx, |
808 | .send_xchar = sunsab_send_xchar, | 802 | .send_xchar = sunsab_send_xchar, |
809 | .stop_rx = sunsab_stop_rx, | 803 | .stop_rx = sunsab_stop_rx, |
810 | .enable_ms = sunsab_enable_ms, | ||
811 | .break_ctl = sunsab_break_ctl, | 804 | .break_ctl = sunsab_break_ctl, |
812 | .startup = sunsab_startup, | 805 | .startup = sunsab_startup, |
813 | .shutdown = sunsab_shutdown, | 806 | .shutdown = sunsab_shutdown, |
diff --git a/drivers/tty/serial/tilegx.c b/drivers/tty/serial/tilegx.c index 613ccf09dc2a..453215f5420d 100644 --- 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) | |||
314 | mutex_unlock(&tile_uart->mutex); | 314 | mutex_unlock(&tile_uart->mutex); |
315 | } | 315 | } |
316 | 316 | ||
317 | |||
318 | /* | ||
319 | * Enable modem status interrupts. | ||
320 | */ | ||
321 | static void tilegx_enable_ms(struct uart_port *port) | ||
322 | { | ||
323 | /* N/A */ | ||
324 | } | ||
325 | |||
326 | /* | 317 | /* |
327 | * Control the transmission of a break signal. | 318 | * Control the transmission of a break signal. |
328 | */ | 319 | */ |
@@ -614,7 +605,6 @@ static const struct uart_ops tilegx_ops = { | |||
614 | .stop_tx = tilegx_stop_tx, | 605 | .stop_tx = tilegx_stop_tx, |
615 | .start_tx = tilegx_start_tx, | 606 | .start_tx = tilegx_start_tx, |
616 | .stop_rx = tilegx_stop_rx, | 607 | .stop_rx = tilegx_stop_rx, |
617 | .enable_ms = tilegx_enable_ms, | ||
618 | .break_ctl = tilegx_break_ctl, | 608 | .break_ctl = tilegx_break_ctl, |
619 | .startup = tilegx_startup, | 609 | .startup = tilegx_startup, |
620 | .shutdown = tilegx_shutdown, | 610 | .shutdown = tilegx_shutdown, |
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c index f87097acd8ab..0d11d5032b93 100644 --- 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) | |||
244 | *ier |= CTS_DELTA; | 244 | *ier |= CTS_DELTA; |
245 | } | 245 | } |
246 | 246 | ||
247 | static void timbuart_enable_ms(struct uart_port *port) | ||
248 | { | ||
249 | /* N/A */ | ||
250 | } | ||
251 | |||
252 | static void timbuart_break_ctl(struct uart_port *port, int ctl) | 247 | static void timbuart_break_ctl(struct uart_port *port, int ctl) |
253 | { | 248 | { |
254 | /* N/A */ | 249 | /* N/A */ |
@@ -405,7 +400,6 @@ static struct uart_ops timbuart_ops = { | |||
405 | .start_tx = timbuart_start_tx, | 400 | .start_tx = timbuart_start_tx, |
406 | .flush_buffer = timbuart_flush_buffer, | 401 | .flush_buffer = timbuart_flush_buffer, |
407 | .stop_rx = timbuart_stop_rx, | 402 | .stop_rx = timbuart_stop_rx, |
408 | .enable_ms = timbuart_enable_ms, | ||
409 | .break_ctl = timbuart_break_ctl, | 403 | .break_ctl = timbuart_break_ctl, |
410 | .startup = timbuart_startup, | 404 | .startup = timbuart_startup, |
411 | .shutdown = timbuart_shutdown, | 405 | .shutdown = timbuart_shutdown, |
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c index dce27f34937e..9fc22f40796e 100644 --- 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) | |||
250 | | ULITE_STATUS_FRAME | ULITE_STATUS_OVERRUN; | 250 | | ULITE_STATUS_FRAME | ULITE_STATUS_OVERRUN; |
251 | } | 251 | } |
252 | 252 | ||
253 | static void ulite_enable_ms(struct uart_port *port) | ||
254 | { | ||
255 | /* N/A */ | ||
256 | } | ||
257 | |||
258 | static void ulite_break_ctl(struct uart_port *port, int ctl) | 253 | static void ulite_break_ctl(struct uart_port *port, int ctl) |
259 | { | 254 | { |
260 | /* N/A */ | 255 | /* N/A */ |
@@ -395,7 +390,6 @@ static struct uart_ops ulite_ops = { | |||
395 | .stop_tx = ulite_stop_tx, | 390 | .stop_tx = ulite_stop_tx, |
396 | .start_tx = ulite_start_tx, | 391 | .start_tx = ulite_start_tx, |
397 | .stop_rx = ulite_stop_rx, | 392 | .stop_rx = ulite_stop_rx, |
398 | .enable_ms = ulite_enable_ms, | ||
399 | .break_ctl = ulite_break_ctl, | 393 | .break_ctl = ulite_break_ctl, |
400 | .startup = ulite_startup, | 394 | .startup = ulite_startup, |
401 | .shutdown = ulite_shutdown, | 395 | .shutdown = ulite_shutdown, |
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index 1c52074c38df..c107a0f0e72f 100644 --- 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) | |||
435 | clrbits16(&qe_port->uccp->uccm, UCC_UART_UCCE_RX); | 435 | clrbits16(&qe_port->uccp->uccm, UCC_UART_UCCE_RX); |
436 | } | 436 | } |
437 | 437 | ||
438 | /* | ||
439 | * Enable status change interrupts | ||
440 | * | ||
441 | * We don't support status change interrupts, but we need to define this | ||
442 | * function otherwise the kernel will panic. | ||
443 | */ | ||
444 | static void qe_uart_enable_ms(struct uart_port *port) | ||
445 | { | ||
446 | } | ||
447 | |||
448 | /* Start or stop sending break signal | 438 | /* Start or stop sending break signal |
449 | * | 439 | * |
450 | * This function controls the sending of a break signal. If break_state=1, | 440 | * This function controls the sending of a break signal. If break_state=1, |
@@ -1102,7 +1092,6 @@ static struct uart_ops qe_uart_pops = { | |||
1102 | .stop_tx = qe_uart_stop_tx, | 1092 | .stop_tx = qe_uart_stop_tx, |
1103 | .start_tx = qe_uart_start_tx, | 1093 | .start_tx = qe_uart_start_tx, |
1104 | .stop_rx = qe_uart_stop_rx, | 1094 | .stop_rx = qe_uart_stop_rx, |
1105 | .enable_ms = qe_uart_enable_ms, | ||
1106 | .break_ctl = qe_uart_break_ctl, | 1095 | .break_ctl = qe_uart_break_ctl, |
1107 | .startup = qe_uart_startup, | 1096 | .startup = qe_uart_startup, |
1108 | .shutdown = qe_uart_shutdown, | 1097 | .shutdown = qe_uart_shutdown, |
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 8809775e2ba3..01951d27cc03 100644 --- 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) | |||
918 | /* N/A */ | 918 | /* N/A */ |
919 | } | 919 | } |
920 | 920 | ||
921 | static void cdns_uart_enable_ms(struct uart_port *port) | ||
922 | { | ||
923 | /* N/A */ | ||
924 | } | ||
925 | |||
926 | #ifdef CONFIG_CONSOLE_POLL | 921 | #ifdef CONFIG_CONSOLE_POLL |
927 | static int cdns_uart_poll_get_char(struct uart_port *port) | 922 | static int cdns_uart_poll_get_char(struct uart_port *port) |
928 | { | 923 | { |
@@ -974,7 +969,6 @@ static void cdns_uart_poll_put_char(struct uart_port *port, unsigned char c) | |||
974 | static struct uart_ops cdns_uart_ops = { | 969 | static struct uart_ops cdns_uart_ops = { |
975 | .set_mctrl = cdns_uart_set_mctrl, | 970 | .set_mctrl = cdns_uart_set_mctrl, |
976 | .get_mctrl = cdns_uart_get_mctrl, | 971 | .get_mctrl = cdns_uart_get_mctrl, |
977 | .enable_ms = cdns_uart_enable_ms, | ||
978 | .start_tx = cdns_uart_start_tx, | 972 | .start_tx = cdns_uart_start_tx, |
979 | .stop_tx = cdns_uart_stop_tx, | 973 | .stop_tx = cdns_uart_stop_tx, |
980 | .stop_rx = cdns_uart_stop_rx, | 974 | .stop_rx = cdns_uart_stop_rx, |