Merge tag 'tty-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

+1 -1

drivers/tty/serial/8250/8250_omap.c

··· 106 106 #define UART_OMAP_EFR2_TIMEOUT_BEHAVE BIT(6) 107 107 108 108 /* RX FIFO occupancy indicator */ 109 - #define UART_OMAP_RX_LVL 0x64 109 + #define UART_OMAP_RX_LVL 0x19 110 110 111 111 struct omap8250_priv { 112 112 int line;

+1 -1

drivers/tty/serial/mvebu-uart.c

··· 163 163 st = readl(port->membase + UART_STAT); 164 164 spin_unlock_irqrestore(&port->lock, flags); 165 165 166 - return (st & STAT_TX_FIFO_EMP) ? TIOCSER_TEMT : 0; 166 + return (st & STAT_TX_EMP) ? TIOCSER_TEMT : 0; 167 167 } 168 168 169 169 static unsigned int mvebu_uart_get_mctrl(struct uart_port *port)

+22 -22

drivers/tty/synclink_gt.c

··· 438 438 static void tdma_reset(struct slgt_info *info); 439 439 static bool tx_load(struct slgt_info *info, const char *buf, unsigned int count); 440 440 441 - static void get_signals(struct slgt_info *info); 442 - static void set_signals(struct slgt_info *info); 441 + static void get_gtsignals(struct slgt_info *info); 442 + static void set_gtsignals(struct slgt_info *info); 443 443 static void set_rate(struct slgt_info *info, u32 data_rate); 444 444 445 445 static void bh_transmit(struct slgt_info *info); ··· 720 720 if ((old_termios->c_cflag & CBAUD) && !C_BAUD(tty)) { 721 721 info->signals &= ~(SerialSignal_RTS | SerialSignal_DTR); 722 722 spin_lock_irqsave(&info->lock,flags); 723 - set_signals(info); 723 + set_gtsignals(info); 724 724 spin_unlock_irqrestore(&info->lock,flags); 725 725 } 726 726 ··· 730 730 if (!C_CRTSCTS(tty) || !tty_throttled(tty)) 731 731 info->signals |= SerialSignal_RTS; 732 732 spin_lock_irqsave(&info->lock,flags); 733 - set_signals(info); 733 + set_gtsignals(info); 734 734 spin_unlock_irqrestore(&info->lock,flags); 735 735 } 736 736 ··· 1181 1181 1182 1182 /* output current serial signal states */ 1183 1183 spin_lock_irqsave(&info->lock,flags); 1184 - get_signals(info); 1184 + get_gtsignals(info); 1185 1185 spin_unlock_irqrestore(&info->lock,flags); 1186 1186 1187 1187 stat_buf[0] = 0; ··· 1281 1281 if (C_CRTSCTS(tty)) { 1282 1282 spin_lock_irqsave(&info->lock,flags); 1283 1283 info->signals &= ~SerialSignal_RTS; 1284 - set_signals(info); 1284 + set_gtsignals(info); 1285 1285 spin_unlock_irqrestore(&info->lock,flags); 1286 1286 } 1287 1287 } ··· 1306 1306 if (C_CRTSCTS(tty)) { 1307 1307 spin_lock_irqsave(&info->lock,flags); 1308 1308 info->signals |= SerialSignal_RTS; 1309 - set_signals(info); 1309 + set_gtsignals(info); 1310 1310 spin_unlock_irqrestore(&info->lock,flags); 1311 1311 } 1312 1312 } ··· 1477 1477 1478 1478 /* inform generic HDLC layer of current DCD status */ 1479 1479 spin_lock_irqsave(&info->lock, flags); 1480 - get_signals(info); 1480 + get_gtsignals(info); 1481 1481 spin_unlock_irqrestore(&info->lock, flags); 1482 1482 if (info->signals & SerialSignal_DCD) 1483 1483 netif_carrier_on(dev); ··· 2229 2229 if (info->params.mode != MGSL_MODE_ASYNC && info->drop_rts_on_tx_done) { 2230 2230 info->signals &= ~SerialSignal_RTS; 2231 2231 info->drop_rts_on_tx_done = false; 2232 - set_signals(info); 2232 + set_gtsignals(info); 2233 2233 } 2234 2234 2235 2235 #if SYNCLINK_GENERIC_HDLC ··· 2394 2394 2395 2395 if (!info->port.tty || info->port.tty->termios.c_cflag & HUPCL) { 2396 2396 info->signals &= ~(SerialSignal_RTS | SerialSignal_DTR); 2397 - set_signals(info); 2397 + set_gtsignals(info); 2398 2398 } 2399 2399 2400 2400 flush_cond_wait(&info->gpio_wait_q); ··· 2422 2422 else 2423 2423 async_mode(info); 2424 2424 2425 - set_signals(info); 2425 + set_gtsignals(info); 2426 2426 2427 2427 info->dcd_chkcount = 0; 2428 2428 info->cts_chkcount = 0; ··· 2430 2430 info->dsr_chkcount = 0; 2431 2431 2432 2432 slgt_irq_on(info, IRQ_DCD | IRQ_CTS | IRQ_DSR | IRQ_RI); 2433 - get_signals(info); 2433 + get_gtsignals(info); 2434 2434 2435 2435 if (info->netcount || 2436 2436 (info->port.tty && info->port.tty->termios.c_cflag & CREAD)) ··· 2667 2667 spin_lock_irqsave(&info->lock,flags); 2668 2668 2669 2669 /* return immediately if state matches requested events */ 2670 - get_signals(info); 2670 + get_gtsignals(info); 2671 2671 s = info->signals; 2672 2672 2673 2673 events = mask & ··· 3085 3085 unsigned long flags; 3086 3086 3087 3087 spin_lock_irqsave(&info->lock,flags); 3088 - get_signals(info); 3088 + get_gtsignals(info); 3089 3089 spin_unlock_irqrestore(&info->lock,flags); 3090 3090 3091 3091 result = ((info->signals & SerialSignal_RTS) ? TIOCM_RTS:0) + ··· 3124 3124 info->signals &= ~SerialSignal_DTR; 3125 3125 3126 3126 spin_lock_irqsave(&info->lock,flags); 3127 - set_signals(info); 3127 + set_gtsignals(info); 3128 3128 spin_unlock_irqrestore(&info->lock,flags); 3129 3129 return 0; 3130 3130 } ··· 3135 3135 struct slgt_info *info = container_of(port, struct slgt_info, port); 3136 3136 3137 3137 spin_lock_irqsave(&info->lock,flags); 3138 - get_signals(info); 3138 + get_gtsignals(info); 3139 3139 spin_unlock_irqrestore(&info->lock,flags); 3140 3140 return (info->signals & SerialSignal_DCD) ? 1 : 0; 3141 3141 } ··· 3150 3150 info->signals |= SerialSignal_RTS | SerialSignal_DTR; 3151 3151 else 3152 3152 info->signals &= ~(SerialSignal_RTS | SerialSignal_DTR); 3153 - set_signals(info); 3153 + set_gtsignals(info); 3154 3154 spin_unlock_irqrestore(&info->lock,flags); 3155 3155 } 3156 3156 ··· 3948 3948 3949 3949 if (info->params.mode != MGSL_MODE_ASYNC) { 3950 3950 if (info->params.flags & HDLC_FLAG_AUTO_RTS) { 3951 - get_signals(info); 3951 + get_gtsignals(info); 3952 3952 if (!(info->signals & SerialSignal_RTS)) { 3953 3953 info->signals |= SerialSignal_RTS; 3954 - set_signals(info); 3954 + set_gtsignals(info); 3955 3955 info->drop_rts_on_tx_done = true; 3956 3956 } 3957 3957 } ··· 4005 4005 rx_stop(info); 4006 4006 4007 4007 info->signals &= ~(SerialSignal_RTS | SerialSignal_DTR); 4008 - set_signals(info); 4008 + set_gtsignals(info); 4009 4009 4010 4010 slgt_irq_off(info, IRQ_ALL | IRQ_MASTER); 4011 4011 } ··· 4427 4427 /* 4428 4428 * get state of V24 status (input) signals 4429 4429 */ 4430 - static void get_signals(struct slgt_info *info) 4430 + static void get_gtsignals(struct slgt_info *info) 4431 4431 { 4432 4432 unsigned short status = rd_reg16(info, SSR); 4433 4433 ··· 4489 4489 /* 4490 4490 * set state of V24 control (output) signals 4491 4491 */ 4492 - static void set_signals(struct slgt_info *info) 4492 + static void set_gtsignals(struct slgt_info *info) 4493 4493 { 4494 4494 unsigned char val = rd_reg8(info, VCR); 4495 4495 if (info->signals & SerialSignal_DTR)

-1

drivers/tty/tty_ldisc.c

··· 812 812 813 813 tty_ldisc_debug(tty, "released\n"); 814 814 } 815 - EXPORT_SYMBOL_GPL(tty_ldisc_release); 816 815 817 816 /** 818 817 * tty_ldisc_init - ldisc setup for new tty

Configure Feed

Configure Feed