[src/trunk]: src/sys/arch/x86 KNF.

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

details:   https://anonhg.NetBSD.org/src/rev/3e458a4eeecd
branches:  trunk
changeset: 339537:3e458a4eeecd
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Jul 27 15:45:20 2015 +0000

description:
KNF.

diffstat:

 sys/arch/x86/pci/pci_ranges.c     |  14 ++++++++------
 sys/arch/x86/pci/pciide_machdep.c |   7 ++++---
 sys/arch/x86/x86/errata.c         |  12 ++++++------
 sys/arch/x86/x86/ioapic.c         |   5 ++---
 sys/arch/x86/x86/lapic.c          |   6 +++---
 5 files changed, 23 insertions(+), 21 deletions(-)

diffs (155 lines):

diff -r d8da780d7cec -r 3e458a4eeecd sys/arch/x86/pci/pci_ranges.c
--- a/sys/arch/x86/pci/pci_ranges.c     Mon Jul 27 09:59:49 2015 +0000
+++ b/sys/arch/x86/pci/pci_ranges.c     Mon Jul 27 15:45:20 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_ranges.c,v 1.4 2012/10/27 17:18:14 chs Exp $       */
+/*     $NetBSD: pci_ranges.c,v 1.5 2015/07/27 15:45:20 msaitoh Exp $   */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_ranges.c,v 1.4 2012/10/27 17:18:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_ranges.c,v 1.5 2015/07/27 15:45:20 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -243,8 +243,10 @@
                r[1].r_ofs = ofshigh;
                r[1].r_val = iohigh;
 
-               baseh = (iohigh >> PCI_BRIDGE_IOHIGH_BASE_SHIFT) & PCI_BRIDGE_IOHIGH_BASE_MASK;
-               limith = (iohigh >> PCI_BRIDGE_IOHIGH_LIMIT_SHIFT) & PCI_BRIDGE_IOHIGH_LIMIT_MASK;
+               baseh = (iohigh >> PCI_BRIDGE_IOHIGH_BASE_SHIFT)
+                   & PCI_BRIDGE_IOHIGH_BASE_MASK;
+               limith = (iohigh >> PCI_BRIDGE_IOHIGH_LIMIT_SHIFT)
+                   & PCI_BRIDGE_IOHIGH_LIMIT_MASK;
 
                baser |= baseh << 4;
                limitr |= limith << 4;
@@ -385,8 +387,8 @@
 }
 
 static bool
-mmio_range_extend_by_bar(struct range_infer_ctx *ric, int bus, int dev, int fun,
-    int ofs, pcireg_t curbar, pcireg_t sizebar)
+mmio_range_extend_by_bar(struct range_infer_ctx *ric, int bus, int dev,
+    int fun, int ofs, pcireg_t curbar, pcireg_t sizebar)
 {
        int type;
        bool prefetchable;
diff -r d8da780d7cec -r 3e458a4eeecd sys/arch/x86/pci/pciide_machdep.c
--- a/sys/arch/x86/pci/pciide_machdep.c Mon Jul 27 09:59:49 2015 +0000
+++ b/sys/arch/x86/pci/pciide_machdep.c Mon Jul 27 15:45:20 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_machdep.c,v 1.14 2015/04/27 06:51:40 knakahara Exp $    */
+/*     $NetBSD: pciide_machdep.c,v 1.15 2015/07/27 15:45:20 msaitoh Exp $      */
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.14 2015/04/27 06:51:40 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.15 2015/07/27 15:45:20 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -93,7 +93,8 @@
 }
 
 void
-pciide_machdep_compat_intr_disestablish(device_t dev, pci_chipset_tag_t pc, int chan, void *cookie)
+pciide_machdep_compat_intr_disestablish(device_t dev, pci_chipset_tag_t pc,
+    int chan, void *cookie)
 {
        isa_intr_disestablish(NULL, cookie);
        return;
diff -r d8da780d7cec -r 3e458a4eeecd sys/arch/x86/x86/errata.c
--- a/sys/arch/x86/x86/errata.c Mon Jul 27 09:59:49 2015 +0000
+++ b/sys/arch/x86/x86/errata.c Mon Jul 27 15:45:20 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: errata.c,v 1.21 2013/03/21 13:22:37 christos Exp $     */
+/*     $NetBSD: errata.c,v 1.22 2015/07/27 15:45:20 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.21 2013/03/21 13:22:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: errata.c,v 1.22 2015/07/27 15:45:20 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -375,9 +375,9 @@
 
        if (upgrade && !again) {
                again = 1;
-               aprint_normal_dev(ci->ci_dev, "WARNING: errata present, BIOS upgrade "
-                   "may be\n");
-               aprint_normal_dev(ci->ci_dev, "WARNING: necessary to ensure reliable "
-                   "operation\n");
+               aprint_normal_dev(ci->ci_dev, "WARNING: errata present,"
+                   " BIOS upgrade may be\n");
+               aprint_normal_dev(ci->ci_dev, "WARNING: necessary to ensure"
+                   " reliable operation\n");
        }
 }
diff -r d8da780d7cec -r 3e458a4eeecd sys/arch/x86/x86/ioapic.c
--- a/sys/arch/x86/x86/ioapic.c Mon Jul 27 09:59:49 2015 +0000
+++ b/sys/arch/x86/x86/ioapic.c Mon Jul 27 15:45:20 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ioapic.c,v 1.51 2015/07/17 06:41:18 msaitoh Exp $      */
+/*     $NetBSD: ioapic.c,v 1.52 2015/07/27 15:45:20 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.51 2015/07/17 06:41:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.52 2015/07/27 15:45:20 msaitoh Exp $");
 
 #include "opt_ddb.h"
 
@@ -149,7 +149,6 @@
        val = *sc->sc_data;
 
        return val;
-       
 }
 
 static inline  void
diff -r d8da780d7cec -r 3e458a4eeecd sys/arch/x86/x86/lapic.c
--- a/sys/arch/x86/x86/lapic.c  Mon Jul 27 09:59:49 2015 +0000
+++ b/sys/arch/x86/x86/lapic.c  Mon Jul 27 15:45:20 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lapic.c,v 1.50 2015/07/17 06:41:18 msaitoh Exp $       */
+/*     $NetBSD: lapic.c,v 1.51 2015/07/27 15:45:20 msaitoh Exp $       */
 
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.50 2015/07/17 06:41:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.51 2015/07/27 15:45:20 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"                /* for MPDEBUG */
@@ -411,7 +411,7 @@
                /*
                 * Compute delay in cycles for likely short delays in usec.
                 */
-               for (i=0; i<26; i++)
+               for (i = 0; i < 26; i++)
                        lapic_delaytab[i] = (lapic_frac_cycle_per_usec * i) >>
                            32;