2024-04-19 14:18:01

by Parker Newman

Subject: [PATCH v2 4/4] serial: exar: remove ternaries from cti_get_port_type_xr17c15x_xr17v25x()

From: Parker Newman <[email protected]>

Remove ternary operators from cti_get_port_type_xr17c15x_xr17v25x() for
better readability.

Signed-off-by: Parker Newman <[email protected]>
---
Changes in v2:
- Removed ternary operators completely

drivers/tty/serial/8250/8250_exar.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index 8665d3b7b673..521d2acf4004 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -726,7 +726,7 @@ static enum cti_port_type cti_get_port_type_xr17c15x_xr17v25x(struct exar8250 *p
struct pci_dev *pcidev,
unsigned int port_num)
{
- enum cti_port_type port_type;
+ enum cti_port_type port_type = CTI_PORT_TYPE_RS232;

switch (pcidev->subsystem_device) {
// RS232 only cards
@@ -737,23 +737,22 @@ static enum cti_port_type cti_get_port_type_xr17c15x_xr17v25x(struct exar8250 *p
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_SP_232_NS:
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_XPRS_LP_232:
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_XPRS_LP_232_NS:
- port_type = CTI_PORT_TYPE_RS232;
break;
// 1x RS232, 1x RS422/RS485
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_1_1:
- port_type = (port_num == 0) ?
- CTI_PORT_TYPE_RS232 : CTI_PORT_TYPE_RS422_485;
+ if (port_num)
+ port_type = CTI_PORT_TYPE_RS422_485;
break;
// 2x RS232, 2x RS422/RS485
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_2:
- port_type = (port_num < 2) ?
- CTI_PORT_TYPE_RS232 : CTI_PORT_TYPE_RS422_485;
+ if (port_num > 1)
+ port_type = CTI_PORT_TYPE_RS422_485;
break;
// 4x RS232, 4x RS422/RS485
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_4:
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_4_SP:
- port_type = (port_num < 4) ?
- CTI_PORT_TYPE_RS232 : CTI_PORT_TYPE_RS422_485;
+ if (port_num > 3)
+ port_type = CTI_PORT_TYPE_RS422_485;
break;
// RS232/RS422/RS485 HW (jumper) selectable
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2:
@@ -789,13 +788,13 @@ static enum cti_port_type cti_get_port_type_xr17c15x_xr17v25x(struct exar8250 *p
break;
// 6x RS232, 2x RS422/RS485
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_6_2_SP:
- port_type = (port_num < 6) ?
- CTI_PORT_TYPE_RS232 : CTI_PORT_TYPE_RS422_485;
+ if (port_num > 5)
+ port_type = CTI_PORT_TYPE_RS422_485;
break;
// 2x RS232, 6x RS422/RS485
case PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_6_SP:
- port_type = (port_num < 2) ?
- CTI_PORT_TYPE_RS232 : CTI_PORT_TYPE_RS422_485;
+ if (port_num > 1)
+ port_type = CTI_PORT_TYPE_RS422_485;
break;
default:
dev_err(&pcidev->dev, "unknown/unsupported device\n");
--
2.43.2

2024-04-22 06:34:59

by Jiri Slaby

Subject: Re: [PATCH v2 4/4] serial: exar: remove ternaries from cti_get_port_type_xr17c15x_xr17v25x()

On 19. 04. 24, 16:17, Parker Newman wrote:
> From: Parker Newman <[email protected]>
>
> Remove ternary operators from cti_get_port_type_xr17c15x_xr17v25x() for
> better readability.
>
> Signed-off-by: Parker Newman <[email protected]>

Much better.

Reviewed-by: Jiri Slaby <[email protected]>

> --- a/drivers/tty/serial/8250/8250_exar.c
> +++ b/drivers/tty/serial/8250/8250_exar.c
> @@ -726,7 +726,7 @@ static enum cti_port_type cti_get_port_type_xr17c15x_xr17v25x(struct exar8250 *p
> struct pci_dev *pcidev,
> unsigned int port_num)
> {
> - enum cti_port_type port_type;
> + enum cti_port_type port_type = CTI_PORT_TYPE_RS232;
>
> switch (pcidev->subsystem_device) {
> // RS232 only cards

Unrelated to this one, but // comments are discouraged in the kernel, IMO?

thanks,
--
js
suse labs