anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "serial: Add rs485_supported to uart_port"

Browse Source 
This reverts commit 87c81c19cd which is
commit 8925c31c1ac2f1e05da988581f2a70a2a8c4d638 upstream.

It breaks the kernel API and is not needed for any Android devices, so
revert it for now.  If it is needed in the future, it can be brought
back in an ABI-safe way.

Bug: 161946584
Change-Id: I67ec53c5baa5f85f180c81abbf5035b0303587aa
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-01-26 16:07:46 +00:00
parent 8ccd9528be
commit d753150bdc
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/tty/serial/8250/8250_core.c
View File

@@ -1010,7 +1010,6 @@ int serial8250_register_8250_port(const 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;

1
include/linux/serial_core.h
View File

@@ -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 */