__blockdev_direct_IO(): get rid of submit_io callback

[sfrench/cifs-2.6.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index fd59f600094a0673fd76af07583687ba910eaad3..9e3e5e0d11b227bdfa99ea290b88512cd58c9612 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -579,6 +579,7 @@ struct uart_port {
        struct serial_rs485     rs485;
        struct serial_rs485     rs485_supported;        /* Supported mask for serial_rs485 */
        struct gpio_desc        *rs485_term_gpio;       /* enable RS485 bus termination */
+       struct gpio_desc        *rs485_rx_during_tx_gpio; /* Output GPIO that sets the state of RS485 RX during TX */
        struct serial_iso7816   iso7816;
        void                    *private_data;          /* generic platform data pointer */
 };
@@ -781,7 +782,7 @@ static inline int uart_poll_timeout(struct uart_port *port)
 struct earlycon_device {
        struct console *con;
        struct uart_port port;
-       char options[16];               /* e.g., 115200n8 */
+       char options[32];               /* e.g., 115200n8 */
        unsigned int baud;
 };
 
@@ -896,10 +897,8 @@ static inline bool uart_softcts_mode(struct uart_port *uport)
  * The following are helper functions for the low level drivers.
  */
 
-extern void uart_handle_dcd_change(struct uart_port *uport,
-               unsigned int status);
-extern void uart_handle_cts_change(struct uart_port *uport,
-               unsigned int status);
+extern void uart_handle_dcd_change(struct uart_port *uport, bool active);
+extern void uart_handle_cts_change(struct uart_port *uport, bool active);
 
 extern void uart_insert_char(struct uart_port *port, unsigned int status,
                 unsigned int overrun, unsigned int ch, unsigned int flag);