[src/trunk]: src/sys/arch avoid indentation issues. re-do previous in obio.c...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43f1a4d260ab
branches:  trunk
changeset: 320908:43f1a4d260ab
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 04 21:41:48 2018 +0000

description:
avoid indentation issues.  re-do previous in obio.c to avoid the
does-nothing change, by fixing the intended indentation.

diffstat:

 sys/arch/emips/ebus/dz_ebus.c    |  22 +++++++++++-----------
 sys/arch/emips/ebus/flash_ebus.c |   8 ++++----
 sys/arch/emips/ebus/icap_ebus.c  |   6 +++---
 sys/arch/macppc/dev/obio.c       |  11 +++++------
 4 files changed, 23 insertions(+), 24 deletions(-)

diffs (132 lines):

diff -r d6d94ff8c110 -r 43f1a4d260ab sys/arch/emips/ebus/dz_ebus.c
--- a/sys/arch/emips/ebus/dz_ebus.c     Sun Mar 04 19:57:41 2018 +0000
+++ b/sys/arch/emips/ebus/dz_ebus.c     Sun Mar 04 21:41:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dz_ebus.c,v 1.8 2014/07/25 08:10:32 dholland Exp $     */
+/*     $NetBSD: dz_ebus.c,v 1.9 2018/03/04 21:41:48 mrg Exp $  */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_ebus.c,v 1.8 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_ebus.c,v 1.9 2018/03/04 21:41:48 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -167,15 +167,15 @@
        /* we have no modem control but..*/
        if (dzmctl(sc, line, TIOCM_DTR, DMBIS) & TIOCM_CD)
                tp->t_state |= TS_CARR_ON;
-               s = spltty();
-               while (!(flag & O_NONBLOCK) && !(tp->t_cflag & CLOCAL) &&
-                   !(tp->t_state & TS_CARR_ON)) {
-                       tp->t_wopen++;
-                       error = ttysleep(tp, &tp->t_rawcv, true, 0);
-                       tp->t_wopen--;
-                       if (error)
-                               break;
-               }
+       s = spltty();
+       while (!(flag & O_NONBLOCK) && !(tp->t_cflag & CLOCAL) &&
+           !(tp->t_state & TS_CARR_ON)) {
+               tp->t_wopen++;
+               error = ttysleep(tp, &tp->t_rawcv, true, 0);
+               tp->t_wopen--;
+               if (error)
+                       break;
+       }
        (void)splx(s);
        if (error)
                return error;
diff -r d6d94ff8c110 -r 43f1a4d260ab sys/arch/emips/ebus/flash_ebus.c
--- a/sys/arch/emips/ebus/flash_ebus.c  Sun Mar 04 19:57:41 2018 +0000
+++ b/sys/arch/emips/ebus/flash_ebus.c  Sun Mar 04 21:41:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: flash_ebus.c,v 1.19 2016/11/20 02:34:27 pgoyette Exp $ */
+/*     $NetBSD: flash_ebus.c,v 1.20 2018/03/04 21:41:48 mrg Exp $      */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.19 2016/11/20 02:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20 2018/03/04 21:41:48 mrg Exp $");
 
 /* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
  * Extended to include the Intel JS28F256P30T95.
@@ -2075,8 +2075,8 @@
 
        if (Status == 0)
                printf("error not notified");
-    else
-        printf("status=x%x", Status);
+       else
+               printf("status=x%x", Status);
 
        printf(")\n");
 }
diff -r d6d94ff8c110 -r 43f1a4d260ab sys/arch/emips/ebus/icap_ebus.c
--- a/sys/arch/emips/ebus/icap_ebus.c   Sun Mar 04 19:57:41 2018 +0000
+++ b/sys/arch/emips/ebus/icap_ebus.c   Sun Mar 04 21:41:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icap_ebus.c,v 1.6 2014/07/25 08:10:32 dholland Exp $   */
+/*     $NetBSD: icap_ebus.c,v 1.7 2018/03/04 21:41:48 mrg Exp $        */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: icap_ebus.c,v 1.6 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icap_ebus.c,v 1.7 2018/03/04 21:41:48 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -410,7 +410,7 @@
     if (saf)
         icapstart(sc);
 
-       return (1);
+    return (1);
 }
 
 /*
diff -r d6d94ff8c110 -r 43f1a4d260ab sys/arch/macppc/dev/obio.c
--- a/sys/arch/macppc/dev/obio.c        Sun Mar 04 19:57:41 2018 +0000
+++ b/sys/arch/macppc/dev/obio.c        Sun Mar 04 21:41:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obio.c,v 1.42 2018/03/04 15:25:15 christos Exp $       */
+/*     $NetBSD: obio.c,v 1.43 2018/03/04 21:41:48 mrg Exp $    */
 
 /*-
  * Copyright (C) 1998  Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.42 2018/03/04 15:25:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.43 2018/03/04 21:41:48 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -154,11 +154,10 @@
        case PCI_PRODUCT_APPLE_PANGEA_MACIO:
        case PCI_PRODUCT_APPLE_INTREPID:
                node = pcidev_to_ofdev(pa->pa_pc, pa->pa_tag);
-               if (node == -1) {
+               if (node == -1) 
                        node = OF_finddevice("mac-io");
-                       if (node == -1)
-                               node = OF_finddevice("/pci/mac-io");
-               }
+               if (node == -1)
+                       node = OF_finddevice("/pci/mac-io");
                break;
        case PCI_PRODUCT_APPLE_K2:
        case PCI_PRODUCT_APPLE_SHASTA: