]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
USB: serial: kobil_sct: clean up device type checks
authorJohan Hovold <johan@kernel.org>
Wed, 22 Oct 2025 15:26:37 +0000 (17:26 +0200)
committerJohan Hovold <johan@kernel.org>
Mon, 27 Oct 2025 08:22:09 +0000 (09:22 +0100)
Clean up the driver device type checks by moving logical operators to
the previous line and using consistent indentation of continuation
lines.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/kobil_sct.c

index b8169783f6f068891c3061bbb06cc099b2dd08f1..e1015cab277058912e14a81a3901f2c1c0db09d2 100644 (file)
@@ -239,8 +239,8 @@ static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port)
                dev_dbg(dev, "%s - Send reset_all_queues URB returns: %i\n", __func__, result);
        }
        if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID ||
-           priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID ||
-           priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
+                       priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID ||
+                       priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
                /* start reading (Adapter B 'cause PNP string) */
                result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
                dev_dbg(dev, "%s - Send read URB returns: %i\n", __func__, result);
@@ -318,9 +318,10 @@ static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
        if (((priv->device_type != KOBIL_ADAPTER_B_PRODUCT_ID) && (priv->filled > 2) && (priv->filled >= (priv->buf[1] + 3))) ||
             ((priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID) && (priv->filled > 3) && (priv->filled >= (priv->buf[2] + 4)))) {
                /* stop reading (except TWIN and KAAN SIM) */
-               if ((priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID)
-                       || (priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID))
+               if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID ||
+                               priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID) {
                        usb_kill_urb(port->interrupt_in_urb);
+               }
 
                todo = priv->filled - priv->cur_pos;
 
@@ -347,7 +348,7 @@ static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
 
                /* start reading (except TWIN and KAAN SIM) */
                if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID ||
-                       priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID) {
+                               priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID) {
                        result = usb_submit_urb(port->interrupt_in_urb,
                                        GFP_ATOMIC);
                        dev_dbg(&port->dev, "%s - Send read URB returns: %i\n", __func__, result);
@@ -373,8 +374,8 @@ static int kobil_tiocmget(struct tty_struct *tty)
        int transfer_buffer_length = 8;
 
        priv = usb_get_serial_port_data(port);
-       if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID
-                       || priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
+       if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID ||
+                       priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
                /* This device doesn't support ioctl calls */
                return -EINVAL;
        }
@@ -423,8 +424,8 @@ static int kobil_tiocmset(struct tty_struct *tty,
        u16 val = 0;
 
        priv = usb_get_serial_port_data(port);
-       if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID
-               || priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
+       if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID ||
+                       priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
                /* This device doesn't support ioctl calls */
                return -EINVAL;
        }