| From fe3d6c8a8311790d59ec93ecfd5ce57d98bb2395 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Tue, 17 Dec 2019 19:39:13 -0700 |
| Subject: [PATCH] tty: synclink_gt: Adjust indentation in several functions |
| |
| commit 446e76873b5e4e70bdee5db2f2a894d5b4a7d081 upstream. |
| |
| Clang warns: |
| |
| ../drivers/tty/synclink_gt.c:1337:3: warning: misleading indentation; |
| statement is not part of the previous 'if' [-Wmisleading-indentation] |
| if (C_CRTSCTS(tty)) { |
| ^ |
| ../drivers/tty/synclink_gt.c:1335:2: note: previous statement is here |
| if (I_IXOFF(tty)) |
| ^ |
| ../drivers/tty/synclink_gt.c:2563:3: warning: misleading indentation; |
| statement is not part of the previous 'if' [-Wmisleading-indentation] |
| if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty)) |
| ^ |
| ../drivers/tty/synclink_gt.c:2561:2: note: previous statement is here |
| if (I_INPCK(info->port.tty)) |
| ^ |
| ../drivers/tty/synclink_gt.c:3221:3: warning: misleading indentation; |
| statement is not part of the previous 'else' [-Wmisleading-indentation] |
| set_signals(info); |
| ^ |
| ../drivers/tty/synclink_gt.c:3219:2: note: previous statement is here |
| else |
| ^ |
| 3 warnings generated. |
| |
| The indentation on these lines is not at all consistent, tabs and spaces |
| are mixed together. Convert to just using tabs to be consistent with the |
| Linux kernel coding style and eliminate these warnings from clang. |
| |
| Link: https://github.com/ClangBuiltLinux/linux/issues/822 |
| Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> |
| Link: https://lore.kernel.org/r/20191218023912.13827-1-natechancellor@gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c |
| index e8a9047de451..36f1a4d870eb 100644 |
| --- a/drivers/tty/synclink_gt.c |
| +++ b/drivers/tty/synclink_gt.c |
| @@ -1334,10 +1334,10 @@ static void throttle(struct tty_struct * tty) |
| DBGINFO(("%s throttle\n", info->device_name)); |
| if (I_IXOFF(tty)) |
| send_xchar(tty, STOP_CHAR(tty)); |
| - if (C_CRTSCTS(tty)) { |
| + if (C_CRTSCTS(tty)) { |
| spin_lock_irqsave(&info->lock,flags); |
| info->signals &= ~SerialSignal_RTS; |
| - set_signals(info); |
| + set_signals(info); |
| spin_unlock_irqrestore(&info->lock,flags); |
| } |
| } |
| @@ -1359,10 +1359,10 @@ static void unthrottle(struct tty_struct * tty) |
| else |
| send_xchar(tty, START_CHAR(tty)); |
| } |
| - if (C_CRTSCTS(tty)) { |
| + if (C_CRTSCTS(tty)) { |
| spin_lock_irqsave(&info->lock,flags); |
| info->signals |= SerialSignal_RTS; |
| - set_signals(info); |
| + set_signals(info); |
| spin_unlock_irqrestore(&info->lock,flags); |
| } |
| } |
| @@ -2560,8 +2560,8 @@ static void change_params(struct slgt_info *info) |
| info->read_status_mask = IRQ_RXOVER; |
| if (I_INPCK(info->port.tty)) |
| info->read_status_mask |= MASK_PARITY | MASK_FRAMING; |
| - if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty)) |
| - info->read_status_mask |= MASK_BREAK; |
| + if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty)) |
| + info->read_status_mask |= MASK_BREAK; |
| if (I_IGNPAR(info->port.tty)) |
| info->ignore_status_mask |= MASK_PARITY | MASK_FRAMING; |
| if (I_IGNBRK(info->port.tty)) { |
| @@ -3192,7 +3192,7 @@ static int tiocmset(struct tty_struct *tty, |
| info->signals &= ~SerialSignal_DTR; |
| |
| spin_lock_irqsave(&info->lock,flags); |
| - set_signals(info); |
| + set_signals(info); |
| spin_unlock_irqrestore(&info->lock,flags); |
| return 0; |
| } |
| @@ -3203,7 +3203,7 @@ static int carrier_raised(struct tty_port *port) |
| struct slgt_info *info = container_of(port, struct slgt_info, port); |
| |
| spin_lock_irqsave(&info->lock,flags); |
| - get_signals(info); |
| + get_signals(info); |
| spin_unlock_irqrestore(&info->lock,flags); |
| return (info->signals & SerialSignal_DCD) ? 1 : 0; |
| } |
| @@ -3218,7 +3218,7 @@ static void dtr_rts(struct tty_port *port, int on) |
| info->signals |= SerialSignal_RTS | SerialSignal_DTR; |
| else |
| info->signals &= ~(SerialSignal_RTS | SerialSignal_DTR); |
| - set_signals(info); |
| + set_signals(info); |
| spin_unlock_irqrestore(&info->lock,flags); |
| } |
| |
| -- |
| 2.7.4 |
| |