Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern KNF. No functional change.



details:   https://anonhg.NetBSD.org/src/rev/cb1c01eb9fbe
branches:  trunk
changeset: 346371:cb1c01eb9fbe
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Jul 11 07:42:13 2016 +0000

description:
KNF. No functional change.

diffstat:

 sys/kern/subr_autoconf.c |  35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diffs (108 lines):

diff -r ba82a26f6f7d -r cb1c01eb9fbe sys/kern/subr_autoconf.c
--- a/sys/kern/subr_autoconf.c  Mon Jul 11 07:37:00 2016 +0000
+++ b/sys/kern/subr_autoconf.c  Mon Jul 11 07:42:13 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.242 2016/06/19 09:35:06 bouyer Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.243 2016/07/11 07:42:13 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.242 2016/06/19 09:35:06 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.243 2016/07/11 07:42:13 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -856,7 +856,7 @@
        device_t d;
        const struct cfdata *cf1;
        deviter_t di;
-  
+
 
        /*
         * "alldevs" is likely longer than a modules's cfdata, so make it
@@ -1375,11 +1375,13 @@
                    ca->ca_devsize, sizeof(struct device));
 
        /* get memory for all device vars */
-       KASSERT((ca->ca_flags & DVF_PRIV_ALLOC) || ca->ca_devsize >= sizeof(struct device));
+       KASSERT((ca->ca_flags & DVF_PRIV_ALLOC)
+           || ca->ca_devsize >= sizeof(struct device));
        if (ca->ca_devsize > 0) {
                dev_private = kmem_zalloc(ca->ca_devsize, KM_SLEEP);
                if (dev_private == NULL)
-                       panic("config_devalloc: memory allocation for device softc failed");
+                       panic("config_devalloc: memory allocation for device "
+                           "softc failed");
        } else {
                KASSERT(ca->ca_flags & DVF_PRIV_ALLOC);
                dev_private = NULL;
@@ -1571,8 +1573,10 @@
                aprint_naive("%s (root)", device_xname(dev));
                aprint_normal("%s (root)", device_xname(dev));
        } else {
-               aprint_naive("%s at %s", device_xname(dev), device_xname(parent));
-               aprint_normal("%s at %s", device_xname(dev), device_xname(parent));
+               aprint_naive("%s at %s", device_xname(dev),
+                   device_xname(parent));
+               aprint_normal("%s at %s", device_xname(dev),
+                   device_xname(parent));
                if (print)
                        (void) (*print)(aux, NULL);
        }
@@ -1600,7 +1604,8 @@
        (*dev->dv_cfattach->ca_attach)(parent, dev, aux);
 
        if (!device_pmf_is_registered(dev))
-               aprint_debug_dev(dev, "WARNING: power management not supported\n");
+               aprint_debug_dev(dev, "WARNING: power management not "
+                   "supported\n");
 
        config_process_deferred(&deferred_config_queue, dev);
 
@@ -1782,7 +1787,8 @@
            d = TAILQ_NEXT(d, dv_list)) {
                if (d->dv_parent == dev && d->dv_del_gen == 0) {
                        printf("config_detach: detached device %s"
-                           " has children %s\n", device_xname(dev), device_xname(d));
+                           " has children %s\n", device_xname(dev),
+                           device_xname(d));
                        panic("config_detach");
                }
        }
@@ -2044,8 +2050,7 @@
  * Process a deferred configuration queue.
  */
 static void
-config_process_deferred(struct deferred_config_head *queue,
-    device_t parent)
+config_process_deferred(struct deferred_config_head *queue, device_t parent)
 {
        struct deferred_config *dc, *ndc;
 
@@ -2213,7 +2218,7 @@
        TAILQ_INIT(&af->af_garbage);
        mutex_enter(&alldevs_mtx);
        config_collect_garbage(&af->af_garbage);
-} 
+}
 
 static void
 config_alldevs_exit(struct alldevs_foray *af)
@@ -2410,9 +2415,9 @@
 {
        device_lock_t dvl = device_getlock(dev);
 
-       aprint_debug_dev(dev, "%s.%d, %s dvl_nlock %d dvl_nwait %d dv_flags %x\n",
-           func, line, curlwp_name(), dvl->dvl_nlock, dvl->dvl_nwait,
-           dev->dv_flags);
+       aprint_debug_dev(dev,
+           "%s.%d, %s dvl_nlock %d dvl_nwait %d dv_flags %x\n", func, line,
+           curlwp_name(), dvl->dvl_nlock, dvl->dvl_nwait, dev->dv_flags);
 }
 
 static bool



Home | Main Index | Thread Index | Old Index