diff options
| author | pooka <pooka@NetBSD.org> | 2014-02-25 18:30:08 +0000 |
|---|---|---|
| committer | pooka <pooka@NetBSD.org> | 2014-02-25 18:30:08 +0000 |
| commit | 05fd0bf3e1843b7a1e600ce4f7814ce6d7f7fd62 (patch) | |
| tree | aba8182016b10f912c8727302700741239282d12 /sys/dev | |
| parent | 58dce71adab75247a41a496492671e7caf532ac2 (diff) | |
Ensure that the top level sysctl nodes (kern, vfs, net, ...) exist before
the sysctl link sets are processed, and remove redundancy.
Shaves >13kB off of an amd64 GENERIC, not to mention >1k duplicate
lines of code.
Diffstat (limited to 'sys/dev')
53 files changed, 132 insertions, 515 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index a4923e27a82..b35ca43e062 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.257 2014/01/25 21:11:20 christos Exp $ */ +/* $NetBSD: acpi.c,v 1.258 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.257 2014/01/25 21:11:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.258 2014/02/25 18:30:09 pooka Exp $"); #include "opt_acpi.h" #include "opt_pcifixup.h" @@ -1459,18 +1459,10 @@ SYSCTL_SETUP(sysctl_acpi_setup, "sysctl hw.acpi subtree setup") int err; err = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", - NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); - - if (err != 0) - return; - - err = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi", SYSCTL_DESCR("ACPI subsystem parameters"), NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL); + CTL_HW, CTL_CREATE, CTL_EOL); if (err != 0) return; diff --git a/sys/dev/acpi/acpi_cpu.c b/sys/dev/acpi/acpi_cpu.c index 117b01f2574..0512531bea7 100644 --- a/sys/dev/acpi/acpi_cpu.c +++ b/sys/dev/acpi/acpi_cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu.c,v 1.49 2012/03/27 18:37:57 jruoho Exp $ */ +/* $NetBSD: acpi_cpu.c,v 1.50 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen <jruohonen@iki.fi> @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.49 2012/03/27 18:37:57 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.50 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/cpu.h> @@ -340,15 +340,8 @@ acpicpu_sysctl(device_t self) KASSERT(acpicpu_log == NULL); err = sysctl_createv(&acpicpu_log, 0, NULL, &node, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL); - - if (err != 0) - goto fail; - - err = sysctl_createv(&acpicpu_log, 0, &node, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi", NULL, - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL); + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL); if (err != 0) goto fail; diff --git a/sys/dev/acpi/acpi_debug.c b/sys/dev/acpi/acpi_debug.c index ad5faa31b20..1ad5157d62d 100644 --- a/sys/dev/acpi/acpi_debug.c +++ b/sys/dev/acpi/acpi_debug.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_debug.c,v 1.4 2010/10/27 14:39:26 gsutre Exp $ */ +/* $NetBSD: acpi_debug.c,v 1.5 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi> @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_debug.c,v 1.4 2010/10/27 14:39:26 gsutre Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_debug.c,v 1.5 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/sysctl.h> @@ -78,17 +78,9 @@ acpi_debug_init(void) goto fail; rv = sysctl_createv(NULL, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", - NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); - - if (rv != 0) - goto fail; - - rv = sysctl_createv(NULL, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL); + CTL_HW, CTL_CREATE, CTL_EOL); if (rv != 0) goto fail; diff --git a/sys/dev/acpi/acpi_display.c b/sys/dev/acpi/acpi_display.c index 3b7bab3d0df..daaf4d9b6e9 100644 --- a/sys/dev/acpi/acpi_display.c +++ b/sys/dev/acpi/acpi_display.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_display.c,v 1.10 2012/06/02 21:36:43 dsl Exp $ */ +/* $NetBSD: acpi_display.c,v 1.11 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.10 2012/06/02 21:36:43 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.11 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -1111,15 +1111,9 @@ acpidisp_vga_sysctl_setup(struct acpidisp_vga_softc *asc) if (asc->sc_caps & ACPI_DISP_VGA_CAP__DOS) { if ((sysctl_createv(&asc->sc_log, 0, NULL, &rnode, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL)) != 0) - goto fail; - - if ((sysctl_createv(&asc->sc_log, 0, &rnode, &rnode, 0, CTLTYPE_NODE, "acpi", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL)) != 0) + CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto fail; if ((sysctl_createv(&asc->sc_log, 0, &rnode, &rnode, @@ -1163,15 +1157,9 @@ acpidisp_out_sysctl_setup(struct acpidisp_out_softc *osc) if (osc->sc_brctl != NULL) { #endif if ((sysctl_createv(&osc->sc_log, 0, NULL, &rnode, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL)) != 0) - goto fail; - - if ((sysctl_createv(&osc->sc_log, 0, &rnode, &rnode, 0, CTLTYPE_NODE, "acpi", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL)) != 0) + CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto fail; if ((sysctl_createv(&osc->sc_log, 0, &rnode, &rnode, diff --git a/sys/dev/acpi/acpi_power.c b/sys/dev/acpi/acpi_power.c index 4f62a7f5249..752c1e44f0f 100644 --- a/sys/dev/acpi/acpi_power.c +++ b/sys/dev/acpi/acpi_power.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_power.c,v 1.33 2012/06/02 21:36:43 dsl Exp $ */ +/* $NetBSD: acpi_power.c,v 1.34 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.33 2012/06/02 21:36:43 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.34 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/kmem.h> @@ -651,17 +651,9 @@ SYSCTL_SETUP(sysctl_acpi_power_setup, "sysctl hw.acpi.power subtree setup") int err; err = sysctl_createv(NULL, 0, NULL, &anode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", - NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); - - if (err != 0) - return; - - err = sysctl_createv(NULL, 0, &anode, &anode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL); + CTL_HW, CTL_CREATE, CTL_EOL); if (err != 0) return; diff --git a/sys/dev/acpi/acpi_wakedev.c b/sys/dev/acpi/acpi_wakedev.c index 943dabb6b6e..ee0f9f1b7a1 100644 --- a/sys/dev/acpi/acpi_wakedev.c +++ b/sys/dev/acpi/acpi_wakedev.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_wakedev.c,v 1.25 2012/08/14 14:38:02 jruoho Exp $ */ +/* $NetBSD: acpi_wakedev.c,v 1.26 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2009, 2010, 2011 Jared D. McNeill <jmcneill@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.25 2012/08/14 14:38:02 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.26 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -259,17 +259,9 @@ SYSCTL_SETUP(sysctl_acpi_wakedev_setup, "sysctl hw.acpi.wake subtree setup") int err; err = sysctl_createv(NULL, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", - NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); - - if (err != 0) - return; - - err = sysctl_createv(NULL, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL); + CTL_HW, CTL_CREATE, CTL_EOL); if (err != 0) return; diff --git a/sys/dev/acpi/asus_acpi.c b/sys/dev/acpi/asus_acpi.c index 8ef045fce32..eb37ce2134a 100644 --- a/sys/dev/acpi/asus_acpi.c +++ b/sys/dev/acpi/asus_acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: asus_acpi.c,v 1.24 2012/06/02 21:36:43 dsl Exp $ */ +/* $NetBSD: asus_acpi.c,v 1.25 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 Jared D. McNeill <jmcneill@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.24 2012/06/02 21:36:43 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.25 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -344,10 +344,6 @@ asus_sysctl_setup(struct asus_softc *sc) if (sc->sc_cfvnum == 0) return; - err = sysctl_createv(&sc->sc_log, 0, NULL, NULL, 0, - CTLTYPE_NODE, "hw", NULL, NULL, 0, NULL, 0, CTL_HW, CTL_EOL); - if (err) - goto sysctl_err; err = sysctl_createv(&sc->sc_log, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(sc->sc_dev), NULL, NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL); diff --git a/sys/dev/acpi/fujbp_acpi.c b/sys/dev/acpi/fujbp_acpi.c index 4bcfc5d5465..6cd37025d58 100644 --- a/sys/dev/acpi/fujbp_acpi.c +++ b/sys/dev/acpi/fujbp_acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: fujbp_acpi.c,v 1.3 2012/06/02 21:36:43 dsl Exp $ */ +/* $NetBSD: fujbp_acpi.c,v 1.4 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fujbp_acpi.c,v 1.3 2012/06/02 21:36:43 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fujbp_acpi.c,v 1.4 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -373,15 +373,9 @@ fujitsu_bp_sysctl_setup(struct fujitsu_bp_softc *sc) if (brightness || pointer) { if ((sysctl_createv(&sc->sc_log, 0, NULL, &rnode, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL)) != 0) - goto fail; - - if ((sysctl_createv(&sc->sc_log, 0, &rnode, &rnode, 0, CTLTYPE_NODE, "acpi", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL)) != 0) + CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto fail; if ((sysctl_createv(&sc->sc_log, 0, &rnode, &rnode, diff --git a/sys/dev/acpi/fujhk_acpi.c b/sys/dev/acpi/fujhk_acpi.c index d8eab375eee..81c74ba79ec 100644 --- a/sys/dev/acpi/fujhk_acpi.c +++ b/sys/dev/acpi/fujhk_acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: fujhk_acpi.c,v 1.2 2012/06/02 21:36:43 dsl Exp $ */ +/* $NetBSD: fujhk_acpi.c,v 1.3 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fujhk_acpi.c,v 1.2 2012/06/02 21:36:43 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fujhk_acpi.c,v 1.3 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -279,15 +279,9 @@ fujitsu_hk_sysctl_setup(struct fujitsu_hk_softc *sc) if (fujitsu_hk_get_backlight(sc, &dummy_state) == 0) { if ((sysctl_createv(&sc->sc_log, 0, NULL, &rnode, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL)) != 0) - goto fail; - - if ((sysctl_createv(&sc->sc_log, 0, &rnode, &rnode, 0, CTLTYPE_NODE, "acpi", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL)) != 0) + CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto fail; if ((sysctl_createv(&sc->sc_log, 0, &rnode, &rnode, diff --git a/sys/dev/acpi/sony_acpi.c b/sys/dev/acpi/sony_acpi.c index 452b6e0142f..f16020cdb99 100644 --- a/sys/dev/acpi/sony_acpi.c +++ b/sys/dev/acpi/sony_acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: sony_acpi.c,v 1.21 2012/06/02 21:36:43 dsl Exp $ */ +/* $NetBSD: sony_acpi.c,v 1.22 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.21 2012/06/02 21:36:43 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.22 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/sysctl.h> @@ -179,14 +179,10 @@ sony_walk_cb(ACPI_HANDLE hnd, uint32_t v, void *context, void **status) for (ptr = buf; *ptr; ptr++) *ptr = tolower(*ptr); - if ((rv = sysctl_createv(&sc->sc_log, 0, NULL, &node, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", NULL, NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto out; - - if ((rv = sysctl_createv(&sc->sc_log, 0, &node, &snode, 0, + if ((rv = sysctl_createv(&sc->sc_log, 0, NULL, &snode, 0, CTLTYPE_NODE, device_xname(sc->sc_dev), SYSCTL_DESCR("sony controls"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto out; if ((rv = sysctl_createv(&sc->sc_log, 0, &snode, &node, diff --git a/sys/dev/acpi/wmi/wmi_hp.c b/sys/dev/acpi/wmi/wmi_hp.c index 5e44a793d7d..fbfd68ab9e0 100644 --- a/sys/dev/acpi/wmi/wmi_hp.c +++ b/sys/dev/acpi/wmi/wmi_hp.c @@ -1,4 +1,4 @@ -/* $NetBSD: wmi_hp.c,v 1.7 2012/10/12 13:02:28 cegger Exp $ */ +/* $NetBSD: wmi_hp.c,v 1.8 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.7 2012/10/12 13:02:28 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.8 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -747,15 +747,8 @@ sysctl_wmi_hp_setup(struct wmi_hp_softc *sc) int err; err = sysctl_createv(&wmihp_sysctllog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL); - - if (err != 0) - return; - - err = sysctl_createv(&wmihp_sysctllog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi", NULL, - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL); + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL); if (err != 0) return; diff --git a/sys/dev/bluetooth/bcsp.c b/sys/dev/bluetooth/bcsp.c index 14587d0996b..73920fd810d 100644 --- a/sys/dev/bluetooth/bcsp.c +++ b/sys/dev/bluetooth/bcsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bcsp.c,v 1.22 2013/10/17 21:22:01 christos Exp $ */ +/* $NetBSD: bcsp.c,v 1.23 2014/02/25 18:30:09 pooka Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.22 2013/10/17 21:22:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.23 2014/02/25 18:30:09 pooka Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -287,11 +287,6 @@ bcsp_attach(device_t parent __unused, device_t self, void *aux __unused) /* Attach Bluetooth unit */ sc->sc_unit = hci_attach(&bcsp_hci, self, 0); - if ((rc = sysctl_createv(&sc->sc_log, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } if ((rc = sysctl_createv(&sc->sc_log, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(self), SYSCTL_DESCR("bcsp controls"), diff --git a/sys/dev/bluetooth/btmagic.c b/sys/dev/bluetooth/btmagic.c index 617e2234408..dcd9ffbee95 100644 --- a/sys/dev/bluetooth/btmagic.c +++ b/sys/dev/bluetooth/btmagic.c @@ -1,4 +1,4 @@ -/* $NetBSD: btmagic.c,v 1.5 2012/12/20 11:17:47 plunky Exp $ */ +/* $NetBSD: btmagic.c,v 1.6 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -85,7 +85,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.5 2012/12/20 11:17:47 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.6 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -321,14 +321,6 @@ btmagic_attach(device_t parent, device_t self, void *aux) sc->sc_dist = 130; sc->sc_scale = 20; - sysctl_createv(&sc->sc_log, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", - NULL, - NULL, 0, - NULL, 0, - CTL_HW, CTL_EOL); - sysctl_createv(&sc->sc_log, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(self), diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c index cc0c49795d5..380dac952d3 100644 --- a/sys/dev/ccd.c +++ b/sys/dev/ccd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ccd.c,v 1.146 2013/12/28 19:44:41 pgoyette Exp $ */ +/* $NetBSD: ccd.c,v 1.147 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.146 2013/12/28 19:44:41 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.147 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1730,12 +1730,6 @@ SYSCTL_SETUP(sysctl_kern_ccd_setup, "sysctl kern.ccd subtree setup") { const struct sysctlnode *node = NULL; - /* Make sure net.key exists before we register nodes underneath it. */ - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "kern", NULL, - NULL, 0, NULL, 0, - CTL_KERN, CTL_EOL); sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "ccd", diff --git a/sys/dev/firmload.c b/sys/dev/firmload.c index f2cbf9d4b54..0e2d99e1bf9 100644 --- a/sys/dev/firmload.c +++ b/sys/dev/firmload.c @@ -1,4 +1,4 @@ -/* $NetBSD: firmload.c,v 1.17 2012/04/29 20:27:31 dsl Exp $ */ +/* $NetBSD: firmload.c,v 1.18 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.17 2012/04/29 20:27:31 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.18 2014/02/25 18:30:09 pooka Exp $"); /* * The firmload API provides an interface for device drivers to access @@ -122,13 +122,6 @@ SYSCTL_SETUP_PROTO(sysctl_hw_firmware_setup); SYSCTL_SETUP(sysctl_hw_firmware_setup, "sysctl hw.firmware subtree setup") { const struct sysctlnode *firmware_node; - - if (sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL) != 0) - return; if (sysctl_createv(clog, 0, NULL, &firmware_node, CTLFLAG_PERMANENT, diff --git a/sys/dev/flash/flash_io.c b/sys/dev/flash/flash_io.c index 98494f2b80d..548f9c90e90 100644 --- a/sys/dev/flash/flash_io.c +++ b/sys/dev/flash/flash_io.c @@ -1,4 +1,4 @@ -/* $NetBSD: flash_io.c,v 1.4 2011/08/07 14:03:16 rmind Exp $ */ +/* $NetBSD: flash_io.c,v 1.5 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2011 Department of Software Engineering, @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: flash_io.c,v 1.4 2011/08/07 14:03:16 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: flash_io.c,v 1.5 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -387,12 +387,6 @@ SYSCTL_SETUP(sysctl_flash, "sysctl flash subtree setup") int rc, flash_root_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto error; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "flash", SYSCTL_DESCR("FLASH driver controls"), diff --git a/sys/dev/gpio/gpiopwm.c b/sys/dev/gpio/gpiopwm.c index 8cd8fc6965e..b4fa70d0503 100644 --- a/sys/dev/gpio/gpiopwm.c +++ b/sys/dev/gpio/gpiopwm.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpiopwm.c,v 1.3 2012/06/02 21:36:43 dsl Exp $ */ +/* $NetBSD: gpiopwm.c,v 1.4 2014/02/25 18:30:09 pooka Exp $ */ /* * Copyright (c) 2011 Marc Balmer <marc@msys.ch> @@ -109,11 +109,6 @@ gpiopwm_attach(device_t parent, device_t self, void *aux) callout_init(&sc->sc_pulse, CALLOUT_MPSAFE); callout_setfunc(&sc->sc_pulse, gpiopwm_pulse, sc); - sysctl_createv(NULL, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); sysctl_createv(&sc->sc_log, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(sc->sc_dev), diff --git a/sys/dev/gpio/gpiosim.c b/sys/dev/gpio/gpiosim.c index e0499a59a4e..52aefcf1762 100644 --- a/sys/dev/gpio/gpiosim.c +++ b/sys/dev/gpio/gpiosim.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpiosim.c,v 1.15 2013/05/20 15:48:25 mbalmer Exp $ */ +/* $NetBSD: gpiosim.c,v 1.16 2014/02/25 18:30:09 pooka Exp $ */ /* $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $ */ /* @@ -121,11 +121,6 @@ gpiosim_attach(device_t parent, device_t self, void *aux) pmf_device_register(self, NULL, NULL); - sysctl_createv(NULL, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); sysctl_createv(&sc->sc_log, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(sc->sc_dev), diff --git a/sys/dev/i2c/dbcool.c b/sys/dev/i2c/dbcool.c index 53ca5044530..ec66b1aceed 100644 --- a/sys/dev/i2c/dbcool.c +++ b/sys/dev/i2c/dbcool.c @@ -1,4 +1,4 @@ -/* $NetBSD: dbcool.c,v 1.39 2013/09/12 19:46:31 martin Exp $ */ +/* $NetBSD: dbcool.c,v 1.40 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.39 2013/09/12 19:46:31 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.40 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1111,19 +1111,6 @@ dbcool_read_volt(struct dbcool_softc *sc, uint8_t reg, int nom_idx, bool extres) return ret; } -SYSCTL_SETUP(sysctl_dbcoolsetup, "sysctl dBCool subtree setup") -{ - sysctl_createv(clog, 0, NULL, NULL, -#ifdef _MODULE - 0, -#else - CTLFLAG_PERMANENT, -#endif - CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); -} - static int sysctl_dbcool_temp(SYSCTLFN_ARGS) { diff --git a/sys/dev/i2c/tps65950.c b/sys/dev/i2c/tps65950.c index efc07e94c73..61be12e97e5 100644 --- a/sys/dev/i2c/tps65950.c +++ b/sys/dev/i2c/tps65950.c @@ -1,4 +1,4 @@ -/* $NetBSD: tps65950.c,v 1.3 2012/12/31 21:45:36 jmcneill Exp $ */ +/* $NetBSD: tps65950.c,v 1.4 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2012 Jared D. McNeill <jmcneill@invisible.ca> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tps65950.c,v 1.3 2012/12/31 21:45:36 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tps65950.c,v 1.4 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -273,13 +273,8 @@ tps65950_sysctl_attach(struct tps65950_softc *sc) int error; error = sysctl_createv(log, 0, NULL, &rnode, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", NULL, NULL, 0, NULL, 0, CTL_HW, CTL_EOL); - if (error) - return; - - error = sysctl_createv(log, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "tps65950", SYSCTL_DESCR("tps65950 control"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL); + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL); if (error) return; diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c index 70b0882d530..e2d8ba040ee 100644 --- a/sys/dev/ic/an.c +++ b/sys/dev/ic/an.c @@ -1,4 +1,4 @@ -/* $NetBSD: an.c,v 1.60 2013/09/12 11:42:26 martin Exp $ */ +/* $NetBSD: an.c,v 1.61 2014/02/25 18:30:09 pooka Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.60 2013/09/12 11:42:26 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.61 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> @@ -349,14 +349,9 @@ SYSCTL_SETUP(sysctl_an, "sysctl an(4) subtree setup") const struct sysctlnode *cnode, *rnode; if ((rc = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "an", "Cisco/Aironet 802.11 controls", - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; /* control debugging printfs */ diff --git a/sys/dev/ic/ath_netbsd.c b/sys/dev/ic/ath_netbsd.c index c0936298159..66a3abf8ca5 100644 --- a/sys/dev/ic/ath_netbsd.c +++ b/sys/dev/ic/ath_netbsd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ath_netbsd.c,v 1.21 2011/07/17 20:54:51 joerg Exp $ */ +/* $NetBSD: ath_netbsd.c,v 1.22 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2003, 2004 David Young @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.21 2011/07/17 20:54:51 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.22 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -387,14 +387,9 @@ ath_sysctl_instance(const char *dvname, struct sysctllog **log) const struct sysctlnode *rnode; if ((rc = sysctl_createv(log, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(log, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, dvname, SYSCTL_DESCR("ath information and options"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; return rnode; @@ -410,14 +405,9 @@ ath_sysctl_treetop(struct sysctllog **log) const struct sysctlnode *rnode; if ((rc = sysctl_createv(log, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(log, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "ath", SYSCTL_DESCR("ath information and options"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; return rnode; diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index 634c5d38caf..c965c12f82a 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $NetBSD: bwi.c,v 1.23 2013/10/17 21:24:24 christos Exp $ */ +/* $NetBSD: bwi.c,v 1.24 2014/02/25 18:30:09 pooka Exp $ */ /* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */ /* @@ -48,7 +48,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.23 2013/10/17 21:24:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.24 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -610,14 +610,9 @@ SYSCTL_SETUP(sysctl_bwi, "sysctl bwi(4) subtree setup") const struct sysctlnode *cnode; if ((rc = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "bwi", SYSCTL_DESCR("bwi global controls"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; if ((rc = sysctl_createv(clog, 0, &rnode, &cnode, @@ -643,14 +638,9 @@ bwi_sysctlattach(struct bwi_softc *sc) struct sysctllog **clog = &sc->sc_sysctllog; if ((rc = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, device_xname(sc->sc_dev), SYSCTL_DESCR("bwi controls and statistics"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; if ((rc = sysctl_createv(clog, 0, &rnode, &cnode, diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index 9844dc41f51..fd489c5da56 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtw.c,v 1.120 2013/10/17 21:24:24 christos Exp $ */ +/* $NetBSD: rtw.c,v 1.121 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 David Young. All rights * reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.120 2013/10/17 21:24:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.121 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> @@ -136,14 +136,9 @@ SYSCTL_SETUP(sysctl_rtw, "sysctl rtw(4) subtree setup") const struct sysctlnode *cnode, *rnode; if ((rc = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "rtw", "Realtek RTL818x 802.11 controls", - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; #ifdef RTW_DEBUG diff --git a/sys/dev/ic/spdmem.c b/sys/dev/ic/spdmem.c index 888b0f13f8a..d38d57d0749 100644 --- a/sys/dev/ic/spdmem.c +++ b/sys/dev/ic/spdmem.c @@ -1,4 +1,4 @@ -/* $NetBSD: spdmem.c,v 1.8 2013/07/19 01:02:49 soren Exp $ */ +/* $NetBSD: spdmem.c,v 1.9 2014/02/25 18:30:09 pooka Exp $ */ /* * Copyright (c) 2007 Nicolas Joly @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.8 2013/07/19 01:02:49 soren Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.9 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -126,9 +126,6 @@ static const uint16_t spdmem_cycle_frac[] = { /* Format string for timing info */ #define LATENCY "tAA-tRCD-tRP-tRAS: %d-%d-%d-%d\n" -/* sysctl stuff */ -static int hw_node = CTL_EOL; - /* CRC functions used for certain memory types */ static uint16_t spdcrc16 (struct spdmem_softc *sc, int count) @@ -263,11 +260,10 @@ spdmem_common_attach(struct spdmem_softc *sc, device_t self) * Setup our sysctl subtree, hw.spdmemN */ sc->sc_sysctl_log = NULL; - if (hw_node != CTL_EOL) - sysctl_createv(&sc->sc_sysctl_log, 0, NULL, &node, - 0, CTLTYPE_NODE, - device_xname(self), NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_CREATE, CTL_EOL); + sysctl_createv(&sc->sc_sysctl_log, 0, NULL, &node, + 0, CTLTYPE_NODE, + device_xname(self), NULL, NULL, 0, NULL, 0, + CTL_HW, CTL_CREATE, CTL_EOL); if (node != NULL && spd_len != 0) sysctl_createv(&sc->sc_sysctl_log, 0, NULL, NULL, 0, @@ -390,23 +386,6 @@ spdmem_common_detach(struct spdmem_softc *sc, device_t self) return 0; } -SYSCTL_SETUP(sysctl_spdmem_setup, "sysctl hw.spdmem subtree setup") -{ - const struct sysctlnode *node; - - if (sysctl_createv(clog, 0, NULL, &node, -#ifdef _MODULE - 0, -#else - CTLFLAG_PERMANENT, -#endif - CTLTYPE_NODE, "hw", NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL) != 0) - return; - - hw_node = node->sysctl_num; -} - static void decode_size_speed(device_t self, const struct sysctlnode *node, int dimm_size, int cycle_time, int d_clk, int bits, diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c index 230859399b4..66f219d1b1e 100644 --- a/sys/dev/ic/wi.c +++ b/sys/dev/ic/wi.c @@ -1,4 +1,4 @@ -/* $NetBSD: wi.c,v 1.236 2013/09/15 16:10:45 martin Exp $ */ +/* $NetBSD: wi.c,v 1.237 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -99,7 +99,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.236 2013/09/15 16:10:45 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.237 2014/02/25 18:30:09 pooka Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -289,14 +289,9 @@ SYSCTL_SETUP(sysctl_wi, "sysctl wi(4) subtree setup") #endif /* WI_DEBUG */ if ((rc = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "wi", "Lucent/Prism/Symbol 802.11 controls", - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; #ifdef WI_DEBUG diff --git a/sys/dev/ieee1394/firewire.c b/sys/dev/ieee1394/firewire.c index fd331a2f3a3..2b250927649 100644 --- a/sys/dev/ieee1394/firewire.c +++ b/sys/dev/ieee1394/firewire.c @@ -1,4 +1,4 @@ -/* $NetBSD: firewire.c,v 1.43 2013/10/12 16:49:00 christos Exp $ */ +/* $NetBSD: firewire.c,v 1.44 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.43 2013/10/12 16:49:00 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.44 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -79,12 +79,6 @@ SYSCTL_SETUP(sysctl_ieee1394if, "sysctl ieee1394if(4) subtree setup") int rc, ieee1394if_node_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "ieee1394if", SYSCTL_DESCR("ieee1394if controls"), diff --git a/sys/dev/ieee1394/fwmem.c b/sys/dev/ieee1394/fwmem.c index 1fe9f5893e5..5985a9ddb54 100644 --- a/sys/dev/ieee1394/fwmem.c +++ b/sys/dev/ieee1394/fwmem.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwmem.c,v 1.17 2012/04/29 18:31:40 dsl Exp $ */ +/* $NetBSD: fwmem.c,v 1.18 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2002-2003 * Hidetoshi Shimokawa. All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.17 2012/04/29 18:31:40 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.18 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -73,12 +73,6 @@ SYSCTL_SETUP(sysctl_fwmem, "sysctl fwmem subtree setup") int rc, fwmem_node_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "fwmem", SYSCTL_DESCR("IEEE1394 Memory Access"), diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c index 3701dbdac89..5c340a65540 100644 --- a/sys/dev/ieee1394/fwohci.c +++ b/sys/dev/ieee1394/fwohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci.c,v 1.136 2013/10/16 17:40:55 christos Exp $ */ +/* $NetBSD: fwohci.c,v 1.137 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa @@ -37,7 +37,7 @@ * */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.136 2013/10/16 17:40:55 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.137 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/atomic.h> @@ -77,12 +77,6 @@ SYSCTL_SETUP(sysctl_fwohci, "sysctl fwohci(4) subtree setup") int rc, fwohci_node_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "fwohci", SYSCTL_DESCR("fwohci controls"), diff --git a/sys/dev/ieee1394/if_fwip.c b/sys/dev/ieee1394/if_fwip.c index 9fd7267139e..50b91c41ea5 100644 --- a/sys/dev/ieee1394/if_fwip.c +++ b/sys/dev/ieee1394/if_fwip.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fwip.c,v 1.25 2012/04/29 18:31:40 dsl Exp $ */ +/* $NetBSD: if_fwip.c,v 1.26 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2004 * Doug Rabson @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.25 2012/04/29 18:31:40 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.26 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -114,12 +114,6 @@ SYSCTL_SETUP(sysctl_fwip, "sysctl fwip(4) subtree setup") int rc, fwip_node_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "fwip", SYSCTL_DESCR("fwip controls"), diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c index f1f5c80e3b2..2dd8321435c 100644 --- a/sys/dev/ieee1394/sbp.c +++ b/sys/dev/ieee1394/sbp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbp.c,v 1.35 2013/09/15 13:52:23 martin Exp $ */ +/* $NetBSD: sbp.c,v 1.36 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.35 2013/09/15 13:52:23 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.36 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> @@ -128,11 +128,6 @@ SYSCTL_SETUP(sysctl_sbp, "sysctl sbp(4) subtree setup") int rc, sbp_node_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "sbp", SYSCTL_DESCR("sbp controls"), NULL, 0, NULL, diff --git a/sys/dev/isa/toaster.c b/sys/dev/isa/toaster.c index 7bdd5822910..acbec12ee4d 100644 --- a/sys/dev/isa/toaster.c +++ b/sys/dev/isa/toaster.c @@ -1,4 +1,4 @@ -/* $NetBSD: toaster.c,v 1.12 2012/06/02 21:36:44 dsl Exp $ */ +/* $NetBSD: toaster.c,v 1.13 2014/02/25 18:30:09 pooka Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.12 2012/06/02 21:36:44 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.13 2014/02/25 18:30:09 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -249,13 +249,6 @@ toaster_attach(device_t parent, device_t self, void *aux) sc->burner = 0; sc->latch = 0; - if (sysctl_createv(NULL, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", - NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL) != 0) { - aprint_error_dev(sc->sc_dev, "could not create sysctl\n"); - return; - } if (sysctl_createv(NULL, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(sc->sc_dev), NULL, diff --git a/sys/dev/keylock.c b/sys/dev/keylock.c index 614cb912e38..d44592a59b6 100644 --- a/sys/dev/keylock.c +++ b/sys/dev/keylock.c @@ -1,4 +1,4 @@ -/* $NetBSD: keylock.c,v 1.2 2009/08/15 09:43:58 mbalmer Exp $ */ +/* $NetBSD: keylock.c,v 1.3 2014/02/25 18:30:09 pooka Exp $ */ /* * Copyright (c) 2009 Marc Balmer <marc@msys.ch> @@ -53,11 +53,6 @@ SYSCTL_SETUP(sysctl_keylock_setup, "sysctl keylock setup") { const struct sysctlnode *node = NULL; - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "keylock", diff --git a/sys/dev/marvell/if_mvgbe.c b/sys/dev/marvell/if_mvgbe.c index f3dd28a829c..f900e6d139c 100644 --- a/sys/dev/marvell/if_mvgbe.c +++ b/sys/dev/marvell/if_mvgbe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mvgbe.c,v 1.36 2014/02/03 05:56:23 msaitoh Exp $ */ +/* $NetBSD: if_mvgbe.c,v 1.37 2014/02/25 18:30:10 pooka Exp $ */ /* * Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.36 2014/02/03 05:56:23 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.37 2014/02/25 18:30:10 pooka Exp $"); #include "opt_multiprocessor.h" @@ -2250,12 +2250,6 @@ SYSCTL_SETUP(sysctl_mvgbe, "sysctl mvgbe subtree setup") int rc; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, 0, CTLTYPE_NODE, "mvgbe", SYSCTL_DESCR("mvgbe interface controls"), diff --git a/sys/dev/nor/nor.c b/sys/dev/nor/nor.c index fc1b83f3634..446c1b08a90 100644 --- a/sys/dev/nor/nor.c +++ b/sys/dev/nor/nor.c @@ -1,4 +1,4 @@ -/* $NetBSD: nor.c,v 1.4 2011/08/02 20:44:09 cliff Exp $ */ +/* $NetBSD: nor.c,v 1.5 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2011 Department of Software Engineering, @@ -34,7 +34,7 @@ /* Common driver for NOR chips implementing the ONFI CFI specification */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nor.c,v 1.4 2011/08/02 20:44:09 cliff Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nor.c,v 1.5 2014/02/25 18:30:10 pooka Exp $"); #include "locators.h" #include "opt_nor.h" @@ -1009,12 +1009,6 @@ SYSCTL_SETUP(sysctl_nor, "sysctl nor subtree setup") int rc, nor_root_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto error; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "nor", SYSCTL_DESCR("NOR driver controls"), diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 6fa5f3e0bd5..588b03f5f6c 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.141 2012/06/02 21:36:44 dsl Exp $ */ +/* $NetBSD: auich.c,v 1.142 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.141 2012/06/02 21:36:44 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.142 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -658,11 +658,6 @@ map_done: if (sc->sc_fixedrate && sc->sc_codectype == AC97_CODEC_TYPE_AUDIO) return; - err = sysctl_createv(&sc->sc_log, 0, NULL, NULL, 0, - CTLTYPE_NODE, "hw", NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); - if (err != 0) - goto sysctl_err; err = sysctl_createv(&sc->sc_log, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(self), NULL, NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL); diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 19ac253e738..dd89efe1aa4 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.264 2013/11/07 18:45:32 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.265 2014/02/25 18:30:10 pooka Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.264 2013/11/07 18:45:32 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.265 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -5915,12 +5915,6 @@ bge_sysctl_init(struct bge_softc *sc) int rc, bge_root_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(&sc->bge_log, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto out; - } - if ((rc = sysctl_createv(&sc->bge_log, 0, NULL, &node, 0, CTLTYPE_NODE, "bge", SYSCTL_DESCR("BGE interface controls"), diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index 65751bb948f..5d93479997c 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ipw.c,v 1.55 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: if_ipw.c,v 1.56 2014/02/25 18:30:10 pooka Exp $ */ /* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */ /*- @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.55 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.56 2014/02/25 18:30:10 pooka Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -2260,19 +2260,11 @@ SYSCTL_SETUP(sysctl_hw_ipw_accept_eula_setup, "sysctl hw.ipw.accept_eula") sysctl_createv(NULL, 0, NULL, &rnode, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", - NULL, - NULL, 0, - NULL, 0, - CTL_HW, CTL_EOL); - - sysctl_createv(NULL, 0, &rnode, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "ipw", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL); + CTL_HW, CTL_CREATE, CTL_EOL); sysctl_createv(NULL, 0, &rnode, &cnode, CTLFLAG_PERMANENT | CTLFLAG_READWRITE, diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index e583487e417..f6064235355 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwi.c,v 1.95 2013/11/26 09:46:24 roy Exp $ */ +/* $NetBSD: if_iwi.c,v 1.96 2014/02/25 18:30:10 pooka Exp $ */ /* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */ /*- @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.95 2013/11/26 09:46:24 roy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.96 2014/02/25 18:30:10 pooka Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -2787,14 +2787,9 @@ SYSCTL_SETUP(sysctl_iwi, "sysctl iwi(4) subtree setup") const struct sysctlnode *cnode; if ((rc = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, "iwi", SYSCTL_DESCR("iwi global controls"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; /* control debugging printfs */ @@ -2824,14 +2819,9 @@ iwi_sysctlattach(struct iwi_softc *sc) struct sysctllog **clog = &sc->sc_sysctllog; if ((rc = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, device_xname(sc->sc_dev), SYSCTL_DESCR("iwi controls and statistics"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; if ((rc = sysctl_createv(clog, 0, &rnode, &cnode, @@ -2936,19 +2926,11 @@ SYSCTL_SETUP(sysctl_hw_iwi_accept_eula_setup, "sysctl hw.iwi.accept_eula") sysctl_createv(NULL, 0, NULL, &rnode, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", - NULL, - NULL, 0, - NULL, 0, - CTL_HW, CTL_EOL); - - sysctl_createv(NULL, 0, &rnode, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "iwi", NULL, NULL, 0, NULL, 0, - CTL_CREATE, CTL_EOL); + CTL_HW, CTL_CREATE, CTL_EOL); sysctl_createv(NULL, 0, &rnode, &cnode, CTLFLAG_PERMANENT | CTLFLAG_READWRITE, diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index 906fa9c67de..1563b5ec41d 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_jme.c,v 1.23 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: if_jme.c,v 1.24 2014/02/25 18:30:10 pooka Exp $ */ /* * Copyright (c) 2008 Manuel Bouyer. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.23 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.24 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> @@ -2054,12 +2054,6 @@ SYSCTL_SETUP(sysctl_jme, "sysctl jme subtree setup") int rc; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, 0, CTLTYPE_NODE, "jme", SYSCTL_DESCR("jme interface controls"), diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 203310347e6..08b9ca8fe08 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.43 2013/03/30 03:21:06 christos Exp $ */ +/* $NetBSD: if_msk.c,v 1.44 2014/02/25 18:30:10 pooka Exp $ */ /* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */ /* @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.43 2013/03/30 03:21:06 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.44 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2412,12 +2412,6 @@ SYSCTL_SETUP(sysctl_msk, "sysctl msk subtree setup") int rc; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, 0, CTLTYPE_NODE, "msk", SYSCTL_DESCR("msk interface controls"), diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 52f42dbbc41..a214be151e4 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sk.c,v 1.75 2013/09/13 21:13:08 martin Exp $ */ +/* $NetBSD: if_sk.c,v 1.76 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.75 2013/09/13 21:13:08 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.76 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -3105,12 +3105,6 @@ SYSCTL_SETUP(sysctl_sk, "sysctl sk subtree setup") int rc; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, 0, CTLTYPE_NODE, "sk", SYSCTL_DESCR("sk interface controls"), diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c index 3a337db48b6..4a0566fed15 100644 --- a/sys/dev/pci/if_vte.c +++ b/sys/dev/pci/if_vte.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vte.c,v 1.8 2013/03/30 03:21:08 christos Exp $ */ +/* $NetBSD: if_vte.c,v 1.9 2014/02/25 18:30:10 pooka Exp $ */ /* * Copyright (c) 2011 Manuel Bouyer. All rights reserved. @@ -55,7 +55,7 @@ /* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.8 2013/03/30 03:21:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.9 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1657,12 +1657,6 @@ SYSCTL_SETUP(sysctl_vte, "sysctl vte subtree setup") int rc; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) { - goto err; - } - if ((rc = sysctl_createv(clog, 0, NULL, &node, 0, CTLTYPE_NODE, "vte", SYSCTL_DESCR("vte interface controls"), diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 15b00a0d818..2e51806e4ef 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wpi.c,v 1.56 2013/03/30 03:21:43 christos Exp $ */ +/* $NetBSD: if_wpi.c,v 1.57 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.56 2013/03/30 03:21:43 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.57 2014/02/25 18:30:10 pooka Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -3290,14 +3290,9 @@ wpi_sysctlattach(struct wpi_softc *sc) struct sysctllog **clog = &sc->sc_sysctllog; if ((rc = sysctl_createv(clog, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(clog, 0, &rnode, &rnode, CTLFLAG_PERMANENT, CTLTYPE_NODE, device_xname(sc->sc_dev), SYSCTL_DESCR("wpi controls and statistics"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; if ((rc = sysctl_createv(clog, 0, &rnode, &cnode, diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c index 09cc41425fd..d3f800e34bb 100644 --- a/sys/dev/pci/ixgbe/ixgbe.c +++ b/sys/dev/pci/ixgbe/ixgbe.c @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/ -/*$NetBSD: ixgbe.c,v 1.6 2014/02/09 12:27:37 njoly Exp $*/ +/*$NetBSD: ixgbe.c,v 1.7 2014/02/25 18:30:10 pooka Exp $*/ #include "opt_inet.h" @@ -5347,14 +5347,9 @@ ixgbe_sysctl_instance(struct adapter *adapter) dvname = device_xname(adapter->dev); if ((rc = sysctl_createv(log, 0, NULL, &rnode, - 0, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - - if ((rc = sysctl_createv(log, 0, &rnode, &rnode, 0, CTLTYPE_NODE, dvname, SYSCTL_DESCR("ixgbe information and settings"), - NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) goto err; return rnode; diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c index f46aba12ab1..2b00037e2e6 100644 --- a/sys/dev/pci/twa.c +++ b/sys/dev/pci/twa.c @@ -1,4 +1,4 @@ -/* $NetBSD: twa.c,v 1.45 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: twa.c,v 1.46 2014/02/25 18:30:10 pooka Exp $ */ /* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */ /*- @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.45 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.46 2014/02/25 18:30:10 pooka Exp $"); //#define TWA_DEBUG @@ -1604,14 +1604,6 @@ twa_attach(device_t parent, device_t self, void *aux) twa_sdh = shutdownhook_establish(twa_shutdown, NULL); /* sysctl set-up for 3ware cli */ - if (sysctl_createv(NULL, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", - NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL) != 0) { - aprint_error_dev(sc->twa_dv, "could not create %s sysctl node\n", - "hw"); - return; - } if (sysctl_createv(NULL, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(sc->twa_dv), SYSCTL_DESCR("twa driver information"), diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c index 515ceb8188f..885f72955ae 100644 --- a/sys/dev/pci/twe.c +++ b/sys/dev/pci/twe.c @@ -1,4 +1,4 @@ -/* $NetBSD: twe.c,v 1.99 2013/09/15 15:00:57 martin Exp $ */ +/* $NetBSD: twe.c,v 1.100 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.99 2013/09/15 15:00:57 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.100 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -457,14 +457,6 @@ twe_attach(device_t parent, device_t self, void *aux) TWE_CTL_ENABLE_INTRS); /* sysctl set-up for 3ware cli */ - if (sysctl_createv(NULL, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", - NULL, NULL, 0, NULL, 0, - CTL_HW, CTL_EOL) != 0) { - aprint_error_dev(self, "could not create %s sysctl node\n", - "hw"); - return; - } if (sysctl_createv(NULL, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(self), SYSCTL_DESCR("twe driver information"), diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index b012957861e..15ee7e4aabe 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubsec.c,v 1.36 2014/01/03 16:07:27 pgoyette Exp $ */ +/* $NetBSD: ubsec.c,v 1.37 2014/02/25 18:30:10 pooka Exp $ */ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */ /* $OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $ */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.36 2014/01/03 16:07:27 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.37 2014/02/25 18:30:10 pooka Exp $"); #undef UBSEC_DEBUG @@ -632,11 +632,6 @@ ubsec_sysctl_init(void) ubsec_sysctllog = NULL; - sysctl_createv(&ubsec_sysctllog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); sysctl_createv(&ubsec_sysctllog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "ubsec", diff --git a/sys/dev/pckbport/elantech.c b/sys/dev/pckbport/elantech.c index 620d3fdfd8e..62b4a2b472e 100644 --- a/sys/dev/pckbport/elantech.c +++ b/sys/dev/pckbport/elantech.c @@ -1,4 +1,4 @@ -/* $NetBSD: elantech.c,v 1.5 2012/01/07 10:27:58 jmcneill Exp $ */ +/* $NetBSD: elantech.c,v 1.6 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -29,7 +29,7 @@ #include "opt_pms.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elantech.c,v 1.5 2012/01/07 10:27:58 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elantech.c,v 1.6 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,11 +92,6 @@ pms_sysctl_elantech(struct sysctllog **clog) const struct sysctlnode *node; int rc, root_num; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "elantech", SYSCTL_DESCR("Elantech touchpad controls"), diff --git a/sys/dev/pckbport/synaptics.c b/sys/dev/pckbport/synaptics.c index 3ccbdef59e0..56a3bcf4593 100644 --- a/sys/dev/pckbport/synaptics.c +++ b/sys/dev/pckbport/synaptics.c @@ -1,4 +1,4 @@ -/* $NetBSD: synaptics.c,v 1.30 2012/06/03 13:52:46 dsl Exp $ */ +/* $NetBSD: synaptics.c,v 1.31 2014/02/25 18:30:10 pooka Exp $ */ /* * Copyright (c) 2005, Steve C. Woodford @@ -48,7 +48,7 @@ #include "opt_pms.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.30 2012/06/03 13:52:46 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.31 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -331,11 +331,6 @@ pms_sysctl_synaptics(struct sysctllog **clog) int rc, root_num; const struct sysctlnode *node; - if ((rc = sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0) - goto err; - if ((rc = sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "synaptics", SYSCTL_DESCR("Synaptics touchpad controls"), diff --git a/sys/dev/usb/uatp.c b/sys/dev/usb/uatp.c index 5aecfe43378..99faf4dc698 100644 --- a/sys/dev/usb/uatp.c +++ b/sys/dev/usb/uatp.c @@ -1,4 +1,4 @@ -/* $NetBSD: uatp.c,v 1.4 2013/11/01 17:09:00 christos Exp $ */ +/* $NetBSD: uatp.c,v 1.5 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2011, 2012 Taylor R. Campbell @@ -143,7 +143,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.4 2013/11/01 17:09:00 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.5 2014/02/25 18:30:10 pooka Exp $"); #include <sys/atomic.h> #include <sys/device.h> @@ -985,16 +985,6 @@ uatp_setup_sysctl(struct uatp_softc *sc) { int error; - error = sysctl_createv(&sc->sc_log, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", NULL, - NULL, 0, NULL, 0, - CTL_HW, CTL_EOL); - if (error != 0) { - aprint_error_dev(uatp_dev(sc), "unable to set up sysctl: %d\n", - error); - return; - } - error = sysctl_createv(&sc->sc_log, 0, NULL, &sc->sc_node, 0, CTLTYPE_NODE, device_xname(uatp_dev(sc)), SYSCTL_DESCR("uatp configuration knobs"), diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c index 4207ad5cba8..04c8fe0c3de 100644 --- a/sys/dev/usb/ubt.c +++ b/sys/dev/usb/ubt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubt.c,v 1.49 2012/10/06 14:37:41 christos Exp $ */ +/* $NetBSD: ubt.c,v 1.50 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.49 2012/10/06 14:37:41 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.50 2014/02/25 18:30:10 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -115,14 +115,6 @@ SYSCTL_SETUP(sysctl_hw_ubt_debug_setup, "sysctl hw.ubt_debug setup") { sysctl_createv(NULL, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", - NULL, - NULL, 0, - NULL, 0, - CTL_HW, CTL_EOL); - - sysctl_createv(NULL, 0, NULL, NULL, CTLFLAG_PERMANENT | CTLFLAG_READWRITE, CTLTYPE_INT, "ubt_debug", SYSCTL_DESCR("ubt debug level"), @@ -485,14 +477,6 @@ ubt_attach(device_t parent, device_t self, void *aux) sc->sc_dev); /* sysctl set-up for alternate configs */ - sysctl_createv(&sc->sc_log, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", - NULL, - NULL, 0, - NULL, 0, - CTL_HW, CTL_EOL); - sysctl_createv(&sc->sc_log, 0, NULL, &node, 0, CTLTYPE_NODE, device_xname(sc->sc_dev), diff --git a/sys/dev/usb/uhso.c b/sys/dev/usb/uhso.c index 3896b85d4bd..1a4de2e40de 100644 --- a/sys/dev/usb/uhso.c +++ b/sys/dev/usb/uhso.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhso.c,v 1.11 2013/01/05 01:30:17 christos Exp $ */ +/* $NetBSD: uhso.c,v 1.12 2014/02/25 18:30:10 pooka Exp $ */ /*- * Copyright (c) 2009 Iain Hibbert @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.11 2013/01/05 01:30:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.12 2014/02/25 18:30:10 pooka Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -113,14 +113,6 @@ SYSCTL_SETUP(sysctl_hw_uhso_setup, "uhso sysctl setup") { const struct sysctlnode *node = NULL; - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "hw", - NULL, - NULL, 0, - NULL, 0, - CTL_HW, CTL_EOL); - sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT, CTLTYPE_NODE, "uhso", |
