serial: ar933x: Remove unneeded static structure
authorLino Sanfilippo <l.sanfilippo@kunbus.com>
Sun, 7 Apr 2024 00:27:09 +0000 (02:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Apr 2024 15:07:10 +0000 (17:07 +0200)
In case that no RTS GPIO is available do not use a dedicated nullified
serial_rs485 struct to disable RS485 support, but simply delete the
SER_RS485_ENABLED flag in the ports rs485_supported struct.
This make the structure superfluous and it can be removed.

Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Link: https://lore.kernel.org/r/20240407002709.16224-5-l.sanfilippo@kunbus.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/ar933x_uart.c

index f2836ecc5c19e55af242bc2135212d0547337412..47889a557119885690ee055e2bdcb616b0bcc930 100644 (file)
@@ -692,7 +692,6 @@ static struct uart_driver ar933x_uart_driver = {
        .cons           = NULL, /* filled in runtime */
 };
 
-static const struct serial_rs485 ar933x_no_rs485 = {};
 static const struct serial_rs485 ar933x_rs485_supported = {
        .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND,
 };
@@ -788,7 +787,7 @@ static int ar933x_uart_probe(struct platform_device *pdev)
        up->rts_gpiod = mctrl_gpio_to_gpiod(up->gpios, UART_GPIO_RTS);
 
        if (!up->rts_gpiod) {
-               port->rs485_supported = ar933x_no_rs485;
+               port->rs485_supported.flags &= ~SER_RS485_ENABLED;
                if (port->rs485.flags & SER_RS485_ENABLED) {
                        dev_err(&pdev->dev, "lacking rts-gpio, disabling RS485\n");
                        port->rs485.flags &= ~SER_RS485_ENABLED;