[v2,4/7] chardev: Clean up previous patch indentation

Message ID 20171201232433.25193-5-eblake@redhat.com
State New
Headers show
Series
  • macro do/while (0) cleanup
Related show

Commit Message

Eric Blake Dec. 1, 2017, 11:24 p.m.
The previous patch left in an extra scope layer for ease of
review; time to remove it.  No semantic change.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 chardev/char-serial.c | 66 +++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

Comments

Marc-André Lureau Dec. 3, 2017, 2:20 p.m. | #1
On Sat, Dec 2, 2017 at 12:24 AM, Eric Blake <eblake@redhat.com> wrote:
> The previous patch left in an extra scope layer for ease of
> review; time to remove it.  No semantic change.
>
> Signed-off-by: Eric Blake <eblake@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


 ---
>  chardev/char-serial.c | 66 +++++++++++++++++++++++++--------------------------
>  1 file changed, 32 insertions(+), 34 deletions(-)
>
> diff --git a/chardev/char-serial.c b/chardev/char-serial.c
> index 10162f9fa3..93392c528c 100644
> --- a/chardev/char-serial.c
> +++ b/chardev/char-serial.c
> @@ -71,66 +71,64 @@ static void tty_serial_init(int fd, int speed,
>      }
>
>      speed = speed * 10 / 11;
> -    {
> -        check_speed(50);
> -        check_speed(75);
> -        check_speed(110);
> -        check_speed(134);
> -        check_speed(150);
> -        check_speed(200);
> -        check_speed(300);
> -        check_speed(600);
> -        check_speed(1200);
> -        check_speed(1800);
> -        check_speed(2400);
> -        check_speed(4800);
> -        check_speed(9600);
> -        check_speed(19200);
> -        check_speed(38400);
> -        /* Non-Posix values follow. They may be unsupported on some systems. */
> -        check_speed(57600);
> -        check_speed(115200);
> +    check_speed(50);
> +    check_speed(75);
> +    check_speed(110);
> +    check_speed(134);
> +    check_speed(150);
> +    check_speed(200);
> +    check_speed(300);
> +    check_speed(600);
> +    check_speed(1200);
> +    check_speed(1800);
> +    check_speed(2400);
> +    check_speed(4800);
> +    check_speed(9600);
> +    check_speed(19200);
> +    check_speed(38400);
> +    /* Non-Posix values follow. They may be unsupported on some systems. */
> +    check_speed(57600);
> +    check_speed(115200);
>  #ifdef B230400
> -        check_speed(230400);
> +    check_speed(230400);
>  #endif
>  #ifdef B460800
> -        check_speed(460800);
> +    check_speed(460800);
>  #endif
>  #ifdef B500000
> -        check_speed(500000);
> +    check_speed(500000);
>  #endif
>  #ifdef B576000
> -        check_speed(576000);
> +    check_speed(576000);
>  #endif
>  #ifdef B921600
> -        check_speed(921600);
> +    check_speed(921600);
>  #endif
>  #ifdef B1000000
> -        check_speed(1000000);
> +    check_speed(1000000);
>  #endif
>  #ifdef B1152000
> -        check_speed(1152000);
> +    check_speed(1152000);
>  #endif
>  #ifdef B1500000
> -        check_speed(1500000);
> +    check_speed(1500000);
>  #endif
>  #ifdef B2000000
> -        check_speed(2000000);
> +    check_speed(2000000);
>  #endif
>  #ifdef B2500000
> -        check_speed(2500000);
> +    check_speed(2500000);
>  #endif
>  #ifdef B3000000
> -        check_speed(3000000);
> +    check_speed(3000000);
>  #endif
>  #ifdef B3500000
> -        check_speed(3500000);
> +    check_speed(3500000);
>  #endif
>  #ifdef B4000000
> -        check_speed(4000000);
> +    check_speed(4000000);
>  #endif
> -        spd = B115200;
> -    }
> +    spd = B115200;
>
>  #undef check_speed
>   done:
> --
> 2.14.3
>
>

Patch

diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index 10162f9fa3..93392c528c 100644
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -71,66 +71,64 @@  static void tty_serial_init(int fd, int speed,
     }

     speed = speed * 10 / 11;
-    {
-        check_speed(50);
-        check_speed(75);
-        check_speed(110);
-        check_speed(134);
-        check_speed(150);
-        check_speed(200);
-        check_speed(300);
-        check_speed(600);
-        check_speed(1200);
-        check_speed(1800);
-        check_speed(2400);
-        check_speed(4800);
-        check_speed(9600);
-        check_speed(19200);
-        check_speed(38400);
-        /* Non-Posix values follow. They may be unsupported on some systems. */
-        check_speed(57600);
-        check_speed(115200);
+    check_speed(50);
+    check_speed(75);
+    check_speed(110);
+    check_speed(134);
+    check_speed(150);
+    check_speed(200);
+    check_speed(300);
+    check_speed(600);
+    check_speed(1200);
+    check_speed(1800);
+    check_speed(2400);
+    check_speed(4800);
+    check_speed(9600);
+    check_speed(19200);
+    check_speed(38400);
+    /* Non-Posix values follow. They may be unsupported on some systems. */
+    check_speed(57600);
+    check_speed(115200);
 #ifdef B230400
-        check_speed(230400);
+    check_speed(230400);
 #endif
 #ifdef B460800
-        check_speed(460800);
+    check_speed(460800);
 #endif
 #ifdef B500000
-        check_speed(500000);
+    check_speed(500000);
 #endif
 #ifdef B576000
-        check_speed(576000);
+    check_speed(576000);
 #endif
 #ifdef B921600
-        check_speed(921600);
+    check_speed(921600);
 #endif
 #ifdef B1000000
-        check_speed(1000000);
+    check_speed(1000000);
 #endif
 #ifdef B1152000
-        check_speed(1152000);
+    check_speed(1152000);
 #endif
 #ifdef B1500000
-        check_speed(1500000);
+    check_speed(1500000);
 #endif
 #ifdef B2000000
-        check_speed(2000000);
+    check_speed(2000000);
 #endif
 #ifdef B2500000
-        check_speed(2500000);
+    check_speed(2500000);
 #endif
 #ifdef B3000000
-        check_speed(3000000);
+    check_speed(3000000);
 #endif
 #ifdef B3500000
-        check_speed(3500000);
+    check_speed(3500000);
 #endif
 #ifdef B4000000
-        check_speed(4000000);
+    check_speed(4000000);
 #endif
-        spd = B115200;
-    }
+    spd = B115200;

 #undef check_speed
  done: