Skip to content

Commit 8b152f1

Browse files
shcgitgregkh
shcgit
authored and
gregkh
committed
serial: treewide: Remove empty implementations of enable_ms()
Signed-off-by: Alexander Shiyan <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 1fdc310 commit 8b152f1

40 files changed

+0
-239
lines changed

‎drivers/tty/serial/21285.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ static void serial21285_stop_rx(struct uart_port *port)
7878
}
7979
}
8080

81-
static void serial21285_enable_ms(struct uart_port *port)
82-
{
83-
}
84-
8581
static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)
8682
{
8783
struct uart_port *port = dev_id;
@@ -345,7 +341,6 @@ static struct uart_ops serial21285_ops = {
345341
.stop_tx = serial21285_stop_tx,
346342
.start_tx = serial21285_start_tx,
347343
.stop_rx = serial21285_stop_rx,
348-
.enable_ms = serial21285_enable_ms,
349344
.break_ctl = serial21285_break_ctl,
350345
.startup = serial21285_startup,
351346
.shutdown = serial21285_shutdown,

‎drivers/tty/serial/altera_jtaguart.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ static void altera_jtaguart_break_ctl(struct uart_port *port, int break_state)
109109
{
110110
}
111111

112-
static void altera_jtaguart_enable_ms(struct uart_port *port)
113-
{
114-
}
115-
116112
static void altera_jtaguart_set_termios(struct uart_port *port,
117113
struct ktermios *termios,
118114
struct ktermios *old)
@@ -291,7 +287,6 @@ static struct uart_ops altera_jtaguart_ops = {
291287
.start_tx = altera_jtaguart_start_tx,
292288
.stop_tx = altera_jtaguart_stop_tx,
293289
.stop_rx = altera_jtaguart_stop_rx,
294-
.enable_ms = altera_jtaguart_enable_ms,
295290
.break_ctl = altera_jtaguart_break_ctl,
296291
.startup = altera_jtaguart_startup,
297292
.shutdown = altera_jtaguart_shutdown,

‎drivers/tty/serial/altera_uart.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@ static void altera_uart_break_ctl(struct uart_port *port, int break_state)
163163
spin_unlock_irqrestore(&port->lock, flags);
164164
}
165165

166-
static void altera_uart_enable_ms(struct uart_port *port)
167-
{
168-
}
169-
170166
static void altera_uart_set_termios(struct uart_port *port,
171167
struct ktermios *termios,
172168
struct ktermios *old)
@@ -415,7 +411,6 @@ static struct uart_ops altera_uart_ops = {
415411
.start_tx = altera_uart_start_tx,
416412
.stop_tx = altera_uart_stop_tx,
417413
.stop_rx = altera_uart_stop_rx,
418-
.enable_ms = altera_uart_enable_ms,
419414
.break_ctl = altera_uart_break_ctl,
420415
.startup = altera_uart_startup,
421416
.shutdown = altera_uart_shutdown,

‎drivers/tty/serial/apbuart.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ static void apbuart_stop_rx(struct uart_port *port)
7171
UART_PUT_CTRL(port, cr);
7272
}
7373

74-
static void apbuart_enable_ms(struct uart_port *port)
75-
{
76-
/* No modem status change interrupts for APBUART */
77-
}
78-
7974
static void apbuart_rx_chars(struct uart_port *port)
8075
{
8176
unsigned int status, ch, rsr, flag;
@@ -337,7 +332,6 @@ static struct uart_ops grlib_apbuart_ops = {
337332
.stop_tx = apbuart_stop_tx,
338333
.start_tx = apbuart_start_tx,
339334
.stop_rx = apbuart_stop_rx,
340-
.enable_ms = apbuart_enable_ms,
341335
.break_ctl = apbuart_break_ctl,
342336
.startup = apbuart_startup,
343337
.shutdown = apbuart_shutdown,

‎drivers/tty/serial/ar933x_uart.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,6 @@ static void ar933x_uart_break_ctl(struct uart_port *port, int break_state)
176176
spin_unlock_irqrestore(&up->port.lock, flags);
177177
}
178178

179-
static void ar933x_uart_enable_ms(struct uart_port *port)
180-
{
181-
}
182-
183179
/*
184180
* baudrate = (clk / (scale + 1)) * (step * (1 / 2^17))
185181
*/
@@ -495,7 +491,6 @@ static struct uart_ops ar933x_uart_ops = {
495491
.stop_tx = ar933x_uart_stop_tx,
496492
.start_tx = ar933x_uart_start_tx,
497493
.stop_rx = ar933x_uart_stop_rx,
498-
.enable_ms = ar933x_uart_enable_ms,
499494
.break_ctl = ar933x_uart_break_ctl,
500495
.startup = ar933x_uart_startup,
501496
.shutdown = ar933x_uart_shutdown,

‎drivers/tty/serial/arc_uart.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,6 @@ static void arc_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
340340
/* MCR not present */
341341
}
342342

343-
/* Enable Modem Status Interrupts */
344-
345-
static void arc_serial_enable_ms(struct uart_port *port)
346-
{
347-
/* MSR not present */
348-
}
349-
350343
static void arc_serial_break_ctl(struct uart_port *port, int break_state)
351344
{
352345
/* ARC UART doesn't support sending Break signal */
@@ -510,7 +503,6 @@ static struct uart_ops arc_serial_pops = {
510503
.stop_tx = arc_serial_stop_tx,
511504
.start_tx = arc_serial_start_tx,
512505
.stop_rx = arc_serial_stop_rx,
513-
.enable_ms = arc_serial_enable_ms,
514506
.break_ctl = arc_serial_break_ctl,
515507
.startup = arc_serial_startup,
516508
.shutdown = arc_serial_shutdown,

‎drivers/tty/serial/bfin_sport_uart.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,6 @@ static void sport_stop_rx(struct uart_port *port)
426426
SSYNC();
427427
}
428428

429-
static void sport_enable_ms(struct uart_port *port)
430-
{
431-
pr_debug("%s enter\n", __func__);
432-
}
433-
434429
static void sport_break_ctl(struct uart_port *port, int break_state)
435430
{
436431
pr_debug("%s enter\n", __func__);
@@ -587,7 +582,6 @@ struct uart_ops sport_uart_ops = {
587582
.stop_tx = sport_stop_tx,
588583
.start_tx = sport_start_tx,
589584
.stop_rx = sport_stop_rx,
590-
.enable_ms = sport_enable_ms,
591585
.break_ctl = sport_break_ctl,
592586
.startup = sport_startup,
593587
.shutdown = sport_shutdown,

‎drivers/tty/serial/bfin_uart.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,6 @@ static void bfin_serial_stop_rx(struct uart_port *port)
200200
UART_CLEAR_IER(uart, ERBFI);
201201
}
202202

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-
211203
#if ANOMALY_05000363 && defined(CONFIG_SERIAL_BFIN_PIO)
212204
# define UART_GET_ANOMALY_THRESHOLD(uart) ((uart)->anomaly_threshold)
213205
# define UART_SET_ANOMALY_THRESHOLD(uart, v) ((uart)->anomaly_threshold = (v))
@@ -1014,7 +1006,6 @@ static struct uart_ops bfin_serial_pops = {
10141006
.stop_tx = bfin_serial_stop_tx,
10151007
.start_tx = bfin_serial_start_tx,
10161008
.stop_rx = bfin_serial_stop_rx,
1017-
.enable_ms = bfin_serial_enable_ms,
10181009
.break_ctl = bfin_serial_break_ctl,
10191010
.startup = bfin_serial_startup,
10201011
.shutdown = bfin_serial_shutdown,

‎drivers/tty/serial/clps711x.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@ static const struct uart_ops uart_clps711x_ops = {
352352
.stop_tx = uart_clps711x_stop_tx,
353353
.start_tx = uart_clps711x_start_tx,
354354
.stop_rx = uart_clps711x_nop_void,
355-
.enable_ms = uart_clps711x_nop_void,
356355
.break_ctl = uart_clps711x_break_ctl,
357356
.set_ldisc = uart_clps711x_set_ldisc,
358357
.startup = uart_clps711x_startup,

‎drivers/tty/serial/cpm_uart/cpm_uart_core.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,6 @@ static void cpm_uart_stop_rx(struct uart_port *port)
201201
clrbits16(&sccp->scc_sccm, UART_SCCM_RX);
202202
}
203203

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-
212204
/*
213205
* Generate a break.
214206
*/
@@ -1122,7 +1114,6 @@ static struct uart_ops cpm_uart_pops = {
11221114
.stop_tx = cpm_uart_stop_tx,
11231115
.start_tx = cpm_uart_start_tx,
11241116
.stop_rx = cpm_uart_stop_rx,
1125-
.enable_ms = cpm_uart_enable_ms,
11261117
.break_ctl = cpm_uart_break_ctl,
11271118
.startup = cpm_uart_startup,
11281119
.shutdown = cpm_uart_shutdown,

‎drivers/tty/serial/dz.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,6 @@ static void dz_stop_rx(struct uart_port *uport)
151151
dz_out(dport, DZ_LPR, dport->cflag);
152152
}
153153

154-
static void dz_enable_ms(struct uart_port *uport)
155-
{
156-
/* nothing to do */
157-
}
158-
159154
/*
160155
* ------------------------------------------------------------
161156
*
@@ -751,7 +746,6 @@ static struct uart_ops dz_ops = {
751746
.stop_tx = dz_stop_tx,
752747
.start_tx = dz_start_tx,
753748
.stop_rx = dz_stop_rx,
754-
.enable_ms = dz_enable_ms,
755749
.break_ctl = dz_break_ctl,
756750
.startup = dz_startup,
757751
.shutdown = dz_shutdown,

‎drivers/tty/serial/efm32-uart.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,6 @@ static void efm32_uart_stop_rx(struct uart_port *port)
185185
efm32_uart_write32(efm_port, UARTn_CMD_RXDIS, UARTn_CMD);
186186
}
187187

188-
static void efm32_uart_enable_ms(struct uart_port *port)
189-
{
190-
/* no handshake lines, no modem status interrupts */
191-
}
192-
193188
static void efm32_uart_break_ctl(struct uart_port *port, int ctl)
194189
{
195190
/* not possible without fiddling with gpios */
@@ -499,7 +494,6 @@ static struct uart_ops efm32_uart_pops = {
499494
.stop_tx = efm32_uart_stop_tx,
500495
.start_tx = efm32_uart_start_tx,
501496
.stop_rx = efm32_uart_stop_rx,
502-
.enable_ms = efm32_uart_enable_ms,
503497
.break_ctl = efm32_uart_break_ctl,
504498
.startup = efm32_uart_startup,
505499
.shutdown = efm32_uart_shutdown,

‎drivers/tty/serial/fsl_lpuart.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,6 @@ static void lpuart_stop_rx(struct uart_port *port)
179179
writeb(temp & ~UARTCR2_RE, port->membase + UARTCR2);
180180
}
181181

182-
static void lpuart_enable_ms(struct uart_port *port)
183-
{
184-
}
185-
186182
static void lpuart_copy_rx_to_tty(struct lpuart_port *sport,
187183
struct tty_port *tty, int count)
188184
{
@@ -996,7 +992,6 @@ static struct uart_ops lpuart_pops = {
996992
.stop_tx = lpuart_stop_tx,
997993
.start_tx = lpuart_start_tx,
998994
.stop_rx = lpuart_stop_rx,
999-
.enable_ms = lpuart_enable_ms,
1000995
.break_ctl = lpuart_break_ctl,
1001996
.startup = lpuart_startup,
1002997
.shutdown = lpuart_shutdown,

‎drivers/tty/serial/icom.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,11 +1052,6 @@ static void icom_stop_rx(struct uart_port *port)
10521052
writeb(cmdReg & ~CMD_RCV_ENABLE, &ICOM_PORT->dram->CmdReg);
10531053
}
10541054

1055-
static void icom_enable_ms(struct uart_port *port)
1056-
{
1057-
/* no-op */
1058-
}
1059-
10601055
static void icom_break(struct uart_port *port, int break_state)
10611056
{
10621057
unsigned char cmdReg;
@@ -1300,7 +1295,6 @@ static struct uart_ops icom_ops = {
13001295
.start_tx = icom_start_tx,
13011296
.send_xchar = icom_send_xchar,
13021297
.stop_rx = icom_stop_rx,
1303-
.enable_ms = icom_enable_ms,
13041298
.break_ctl = icom_break,
13051299
.startup = icom_open,
13061300
.shutdown = icom_close,

‎drivers/tty/serial/ioc3_serial.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,6 @@ static struct uart_ops ioc3_ops = {
18801880
.stop_tx = ic3_stop_tx,
18811881
.start_tx = ic3_start_tx,
18821882
.stop_rx = ic3_stop_rx,
1883-
.enable_ms = null_void_function,
18841883
.break_ctl = ic3_break_ctl,
18851884
.startup = ic3_startup,
18861885
.shutdown = ic3_shutdown,

‎drivers/tty/serial/ioc4_serial.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2597,7 +2597,6 @@ static struct uart_ops ioc4_ops = {
25972597
.stop_tx = ic4_stop_tx,
25982598
.start_tx = ic4_start_tx,
25992599
.stop_rx = null_void_function,
2600-
.enable_ms = null_void_function,
26012600
.break_ctl = ic4_break_ctl,
26022601
.startup = ic4_startup,
26032602
.shutdown = ic4_shutdown,

‎drivers/tty/serial/jsm/jsm_tty.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,6 @@ static void jsm_tty_stop_rx(struct uart_port *port)
177177
channel->ch_bd->bd_ops->disable_receiver(channel);
178178
}
179179

180-
static void jsm_tty_enable_ms(struct uart_port *port)
181-
{
182-
/* Nothing needed */
183-
}
184-
185180
static void jsm_tty_break(struct uart_port *port, int break_state)
186181
{
187182
unsigned long lock_flags;
@@ -354,7 +349,6 @@ static struct uart_ops jsm_ops = {
354349
.start_tx = jsm_tty_start_tx,
355350
.send_xchar = jsm_tty_send_xchar,
356351
.stop_rx = jsm_tty_stop_rx,
357-
.enable_ms = jsm_tty_enable_ms,
358352
.break_ctl = jsm_tty_break,
359353
.startup = jsm_tty_open,
360354
.shutdown = jsm_tty_close,

‎drivers/tty/serial/lantiq.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,6 @@ lqasc_stop_rx(struct uart_port *port)
154154
ltq_w32(ASCWHBSTATE_CLRREN, port->membase + LTQ_ASC_WHBSTATE);
155155
}
156156

157-
static void
158-
lqasc_enable_ms(struct uart_port *port)
159-
{
160-
}
161-
162157
static int
163158
lqasc_rx_chars(struct uart_port *port)
164159
{
@@ -568,7 +563,6 @@ static struct uart_ops lqasc_pops = {
568563
.stop_tx = lqasc_stop_tx,
569564
.start_tx = lqasc_start_tx,
570565
.stop_rx = lqasc_stop_rx,
571-
.enable_ms = lqasc_enable_ms,
572566
.break_ctl = lqasc_break_ctl,
573567
.startup = lqasc_startup,
574568
.shutdown = lqasc_shutdown,

‎drivers/tty/serial/lpc32xx_hs.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,6 @@ static void serial_lpc32xx_stop_rx(struct uart_port *port)
427427
LPC32XX_HSU_FE_INT), LPC32XX_HSUART_IIR(port->membase));
428428
}
429429

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-
436430
/* port->lock is not held. */
437431
static void serial_lpc32xx_break_ctl(struct uart_port *port,
438432
int break_state)
@@ -658,7 +652,6 @@ static struct uart_ops serial_lpc32xx_pops = {
658652
.stop_tx = serial_lpc32xx_stop_tx,
659653
.start_tx = serial_lpc32xx_start_tx,
660654
.stop_rx = serial_lpc32xx_stop_rx,
661-
.enable_ms = serial_lpc32xx_enable_ms,
662655
.break_ctl = serial_lpc32xx_break_ctl,
663656
.startup = serial_lpc32xx_startup,
664657
.shutdown = serial_lpc32xx_shutdown,

‎drivers/tty/serial/max310x.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,6 @@ static const struct uart_ops max310x_ops = {
10081008
.stop_tx = max310x_null_void,
10091009
.start_tx = max310x_start_tx,
10101010
.stop_rx = max310x_null_void,
1011-
.enable_ms = max310x_null_void,
10121011
.break_ctl = max310x_break_ctl,
10131012
.startup = max310x_startup,
10141013
.shutdown = max310x_shutdown,

‎drivers/tty/serial/mcf.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,6 @@ static void mcf_break_ctl(struct uart_port *port, int break_state)
150150

151151
/****************************************************************************/
152152

153-
static void mcf_enable_ms(struct uart_port *port)
154-
{
155-
}
156-
157-
/****************************************************************************/
158-
159153
static int mcf_startup(struct uart_port *port)
160154
{
161155
struct mcf_uart *pp = container_of(port, struct mcf_uart, port);
@@ -507,7 +501,6 @@ static const struct uart_ops mcf_uart_ops = {
507501
.start_tx = mcf_start_tx,
508502
.stop_tx = mcf_stop_tx,
509503
.stop_rx = mcf_stop_rx,
510-
.enable_ms = mcf_enable_ms,
511504
.break_ctl = mcf_break_ctl,
512505
.startup = mcf_startup,
513506
.shutdown = mcf_shutdown,

‎drivers/tty/serial/mpsc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,10 +1336,6 @@ static void mpsc_stop_rx(struct uart_port *port)
13361336
mpsc_sdma_cmd(pi, SDMA_SDCM_AR);
13371337
}
13381338

1339-
static void mpsc_enable_ms(struct uart_port *port)
1340-
{
1341-
}
1342-
13431339
static void mpsc_break_ctl(struct uart_port *port, int ctl)
13441340
{
13451341
struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
@@ -1674,7 +1670,6 @@ static struct uart_ops mpsc_pops = {
16741670
.stop_tx = mpsc_stop_tx,
16751671
.start_tx = mpsc_start_tx,
16761672
.stop_rx = mpsc_stop_rx,
1677-
.enable_ms = mpsc_enable_ms,
16781673
.break_ctl = mpsc_break_ctl,
16791674
.startup = mpsc_startup,
16801675
.shutdown = mpsc_shutdown,

0 commit comments

Comments
 (0)