diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2024-04-16 09:37:43 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2024-04-16 09:44:13 +0000 |
| commit | 0412bcfd8863fb4701437ac9f6f0158b50fe3a2f (patch) | |
| tree | f60fe5e3ccabe071157aecb634f45da187953d22 | |
| parent | 8e1cc643b126e17ccbd30845df1fd08b2d628944 (diff) | |
| download | hikey-linaro-0412bcfd8863fb4701437ac9f6f0158b50fe3a2f.tar.gz | |
Revert "serial: Add rs485_supported to uart_port"
This reverts commit dfd8b9d26b8b7289c101cb2e06698d0bc89cf72c which is
commit 8925c31c1ac2f1e05da988581f2a70a2a8c4d638 upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: I4e137aa48fb787f1600c7133d62f4a273f22fbf9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -rw-r--r-- | drivers/tty/serial/8250/8250_core.c | 1 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index 2232bee1b230..8a80c35d4629 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -1020,7 +1020,6 @@ int serial8250_register_8250_port(struct uart_8250_port *up) uart->port.throttle = up->port.throttle; uart->port.unthrottle = up->port.unthrottle; uart->port.rs485_config = up->port.rs485_config; - uart->port.rs485_supported = up->port.rs485_supported; uart->port.rs485 = up->port.rs485; uart->rs485_start_tx = up->rs485_start_tx; uart->rs485_stop_tx = up->rs485_stop_tx; diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index e00cb0668ac5..9f60f549d956 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -257,7 +257,6 @@ struct uart_port { struct attribute_group *attr_group; /* port specific attributes */ const struct attribute_group **tty_groups; /* all attributes (serial core use only) */ struct serial_rs485 rs485; - const struct serial_rs485 *rs485_supported; /* Supported mask for serial_rs485 */ struct gpio_desc *rs485_term_gpio; /* enable RS485 bus termination */ struct serial_iso7816 iso7816; void *private_data; /* generic platform data pointer */ |