serial: core: Simplify uart_get_rs485_mode()
PATCH 1/1 serial: core: Simplify uart_get_rs485_mode()
Simplify uart_get_rs485_mode() by using temporary variable for the GPIO descriptor. With that, use proper type for the flags of the GPIO descriptor.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/tty/serial/serial_core.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/tty/serial/serial_core.c +12 -18
@@ -3565,9 +3565,10 @@ int uart_get_rs485_mode(struct uart_port *port) {struct serial_rs485 *rs485conf = &port->rs485;struct device *dev = port->dev; +enum gpiod_flags dflags; +struct gpio_desc *desc;u32 rs485_delay[2 ];int ret; -int rx_during_tx_gpio_flag; ret =device_property_read_u32_array (dev,"rs485-rts-delay" , rs485_delay,2 );
@@ -3606,26 +3607,19 @@ int uart_get_rs485_mode(struct uart_port *port)* bus participants enable it, no communication is possible at all. * Works fine for short cables and users may enable for longer cables. */ - port->rs485_term_gpio =devm_gpiod_get_optional (dev,"rs485-term" , -GPIOD_OUT_LOW ); -if (IS_ERR (port->rs485_term_gpio)) { - ret =PTR_ERR (port->rs485_term_gpio); - port->rs485_term_gpio =NULL ; -return dev_err_probe (dev, ret,"Cannot get rs485-term-gpios\n" ); - } + desc =devm_gpiod_get_optional (dev,"rs485-term" ,GPIOD_OUT_LOW ); +if (IS_ERR (desc)) +return dev_err_probe (dev,PTR_ERR (desc),"Cannot get rs485-term-gpios\n" ); + port->rs485_term_gpio = desc;if (port->rs485_term_gpio) port->rs485_supported.flags |=SER_RS485_TERMINATE_BUS ; - rx_during_tx_gpio_flag = (rs485conf->flags &SER_RS485_RX_DURING_TX ) ? -GPIOD_OUT_HIGH :GPIOD_OUT_LOW ; - port->rs485_rx_during_tx_gpio =devm_gpiod_get_optional (dev, -"rs485-rx-during-tx" , - rx_during_tx_gpio_flag); -if (IS_ERR (port->rs485_rx_during_tx_gpio)) { - ret =PTR_ERR (port->rs485_rx_during_tx_gpio); - port->rs485_rx_during_tx_gpio =NULL ; -return dev_err_probe (dev, ret,"Cannot get rs485-rx-during-tx-gpios\n" ); - } + dflags = (rs485conf->flags &SER_RS485_RX_DURING_TX ) ? +GPIOD_OUT_HIGH :GPIOD_OUT_LOW ; + desc =devm_gpiod_get_optional (dev,"rs485-rx-during-tx" , dflags); +if (IS_ERR (desc)) +return dev_err_probe (dev,PTR_ERR (desc),"Cannot get rs485-rx-during-tx-gpios\n" ); + port->rs485_rx_during_tx_gpio = desc;return 0 ; }
Signature · 1 line
2.40.0.1.gaa8946217a0b
Quoted 3 lines · Andy Shevchenko
Simplify
uart_get_rs485_mode()by using temporary variable for the GPIO descriptor. With that, use proper type for the flags of the GPIO descriptor.
It seems I will have more against serial core, perhaps it makes sense to unite them in a single series.
Signature · 2 lines
With Best Regards, Andy Shevchenko