Module Name: src
Committed By: msaitoh
Date: Mon Jul 11 07:42:13 UTC 2016
Modified Files:
src/sys/kern: subr_autoconf.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/sys/kern/subr_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.242 src/sys/kern/subr_autoconf.c:1.243
--- src/sys/kern/subr_autoconf.c:1.242 Sun Jun 19 09:35:06 2016
+++ src/sys/kern/subr_autoconf.c Mon Jul 11 07:42:13 2016
@@ -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 @@ rescan_with_cfdata(const struct cfdata *
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 @@ config_devalloc(const device_t parent, c
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 @@ config_attach_loc(device_t parent, cfdat
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 @@ config_attach_loc(device_t parent, cfdat
(*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 @@ config_detach(device_t dev, int flags)
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 @@ config_mountroot(device_t dev, void (*fu
* 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 @@ config_alldevs_enter(struct alldevs_fora
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 @@ pmflock_debug(device_t dev, const char *
{
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
