summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordsl <dsl@NetBSD.org>2012-06-02 21:36:41 +0000
committerdsl <dsl@NetBSD.org>2012-06-02 21:36:41 +0000
commit7c283e7753365d4f53a7263a22beeeb5de8d7c5b (patch)
treeb8a9f9ee0b7068a5d755d6b6d2eeb4486987cd94 /sys/dev
parent284643b9f337a125e69cb0b05e69ce4fa4f75a74 (diff)
Add some pre-processor magic to verify that the type of the data item
passed to sysctl_createv() actually matches the declared type for the item itself. In the places where the caller specifies a function and a structure address (typically the 'softc') an explicit (void *) cast is now needed. Fixes bugs in sys/dev/acpi/asus_acpi.c sys/dev/bluetooth/bcsp.c sys/kern/vfs_bio.c sys/miscfs/syncfs/sync_subr.c and setting AcpiGbl_EnableAmlDebugObject. (mostly passing the address of a uint64_t when typed as CTLTYPE_INT). I've test built quite a few kernels, but there may be some unfixed MD fallout. Most likely passing &char[] to char *. Also add CTLFLAG_UNSIGNED for unsiged decimals - not set yet.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_display.c14
-rw-r--r--sys/dev/acpi/acpi_power.c6
-rw-r--r--sys/dev/acpi/asus_acpi.c8
-rw-r--r--sys/dev/acpi/fujbp_acpi.c8
-rw-r--r--sys/dev/acpi/fujhk_acpi.c6
-rw-r--r--sys/dev/acpi/sony_acpi.c6
-rw-r--r--sys/dev/adb/adb_kbd.c8
-rw-r--r--sys/dev/adb/adb_ms.c6
-rw-r--r--sys/dev/bluetooth/bcsp.c6
-rw-r--r--sys/dev/bluetooth/btmagic.c8
-rw-r--r--sys/dev/gpio/gpiopwm.c6
-rw-r--r--sys/dev/gpio/gpiosim.c4
-rw-r--r--sys/dev/i2c/dbcool.c12
-rw-r--r--sys/dev/i2c/lm75.c6
-rw-r--r--sys/dev/ic/ac97.c8
-rw-r--r--sys/dev/ic/ath_netbsd.h4
-rw-r--r--sys/dev/isa/toaster.c10
-rw-r--r--sys/dev/pci/auich.c6
-rw-r--r--sys/dev/pci/if_iwi.c6
-rw-r--r--sys/dev/pci/if_jme.c12
-rw-r--r--sys/dev/pci/if_msk.c6
-rw-r--r--sys/dev/pci/if_sk.c6
-rw-r--r--sys/dev/pci/if_vte.c8
-rw-r--r--sys/dev/pci/if_wpi.c6
-rw-r--r--sys/dev/pci/ixgbe/ixgbe.c6
-rw-r--r--sys/dev/pci/voyager/pwmclock.c10
-rw-r--r--sys/dev/pckbport/synaptics.c8
-rw-r--r--sys/dev/usb/ubt.c6
28 files changed, 103 insertions, 103 deletions
diff --git a/sys/dev/acpi/acpi_display.c b/sys/dev/acpi/acpi_display.c
index d85a5ed8e0d..3b7bab3d0df 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.9 2011/02/16 09:05:12 jruoho Exp $ */
+/* $NetBSD: acpi_display.c,v 1.10 2012/06/02 21:36:43 dsl 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.9 2011/02/16 09:05:12 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.10 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1133,14 +1133,14 @@ acpidisp_vga_sysctl_setup(struct acpidisp_vga_softc *asc)
(void)sysctl_createv(&asc->sc_log, 0, &rnode, NULL,
CTLFLAG_READWRITE | CTLFLAG_HEX, CTLTYPE_INT, "bios_policy",
SYSCTL_DESCR("Current BIOS switch policies (debug)"),
- acpidisp_vga_sysctl_policy, 0, asc, 0,
+ acpidisp_vga_sysctl_policy, 0, (void *)asc, 0,
CTL_CREATE, CTL_EOL);
#endif
(void)sysctl_createv(&asc->sc_log, 0, &rnode, NULL,
CTLFLAG_READWRITE, CTLTYPE_BOOL, "bios_switch",
SYSCTL_DESCR("Current BIOS output switching policy"),
- acpidisp_vga_sysctl_policy_output, 0, asc, 0,
+ acpidisp_vga_sysctl_policy_output, 0, (void *)asc, 0,
CTL_CREATE, CTL_EOL);
}
@@ -1186,7 +1186,7 @@ acpidisp_out_sysctl_setup(struct acpidisp_out_softc *osc)
(void)sysctl_createv(&osc->sc_log, 0, &rnode, NULL,
CTLFLAG_READWRITE, CTLTYPE_INT, "brightness",
SYSCTL_DESCR("Current brightness level"),
- acpidisp_out_sysctl_brightness, 0, osc, 0,
+ acpidisp_out_sysctl_brightness, 0, (void *)osc, 0,
CTL_CREATE, CTL_EOL);
}
@@ -1195,7 +1195,7 @@ acpidisp_out_sysctl_setup(struct acpidisp_out_softc *osc)
(void)sysctl_createv(&osc->sc_log, 0, &rnode, NULL,
CTLFLAG_READONLY | CTLFLAG_HEX, CTLTYPE_INT, "status",
SYSCTL_DESCR("Current status"),
- acpidisp_out_sysctl_status, 0, osc, 0,
+ acpidisp_out_sysctl_status, 0, (void *)osc, 0,
CTL_CREATE, CTL_EOL);
}
@@ -1210,7 +1210,7 @@ acpidisp_out_sysctl_setup(struct acpidisp_out_softc *osc)
(void)sysctl_createv(&osc->sc_log, 0, &rnode, NULL,
access | CTLFLAG_HEX, CTLTYPE_INT, "state",
SYSCTL_DESCR("Next state (active or inactive)"),
- acpidisp_out_sysctl_state, 0, osc, 0,
+ acpidisp_out_sysctl_state, 0, (void *)osc, 0,
CTL_CREATE, CTL_EOL);
}
#endif
diff --git a/sys/dev/acpi/acpi_power.c b/sys/dev/acpi/acpi_power.c
index ffa0e3d8226..4f62a7f5249 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.32 2011/06/21 03:37:21 jruoho Exp $ */
+/* $NetBSD: acpi_power.c,v 1.33 2012/06/02 21:36:43 dsl 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.32 2011/06/21 03:37:21 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.33 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -708,7 +708,7 @@ acpi_power_add(struct acpi_devnode *ad)
err = sysctl_createv(NULL, 0, NULL, NULL,
CTLFLAG_READONLY, CTLTYPE_STRING, str,
- NULL, acpi_power_sysctl, 0, ad, 0, CTL_HW,
+ NULL, acpi_power_sysctl, 0, (void *)ad, 0, CTL_HW,
acpi_power_acpinode, acpi_power_powernode,
CTL_CREATE, CTL_EOL);
diff --git a/sys/dev/acpi/asus_acpi.c b/sys/dev/acpi/asus_acpi.c
index e250ecbce71..8ef045fce32 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.23 2012/01/21 18:13:56 jmcneill Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.24 2012/06/02 21:36:43 dsl 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.23 2012/01/21 18:13:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.24 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -355,7 +355,7 @@ asus_sysctl_setup(struct asus_softc *sc)
goto sysctl_err;
node_mib = node->sysctl_num;
err = sysctl_createv(&sc->sc_log, 0, NULL, &node_ncfv,
- CTLFLAG_READONLY, CTLTYPE_INT, "ncfv",
+ CTLFLAG_READONLY, CTLTYPE_QUAD, "ncfv",
SYSCTL_DESCR("Number of CPU frequency/voltage modes"),
NULL, 0, &sc->sc_cfvnum, 0,
CTL_HW, node_mib, CTL_CREATE, CTL_EOL);
@@ -365,7 +365,7 @@ asus_sysctl_setup(struct asus_softc *sc)
err = sysctl_createv(&sc->sc_log, 0, NULL, &node_cfv,
CTLFLAG_READWRITE, CTLTYPE_INT, "cfv",
SYSCTL_DESCR("Current CPU frequency/voltage mode"),
- asus_sysctl_verify, 0, sc, 0,
+ asus_sysctl_verify, 0, (void *)sc, 0,
CTL_HW, node_mib, CTL_CREATE, CTL_EOL);
if (err)
goto sysctl_err;
diff --git a/sys/dev/acpi/fujbp_acpi.c b/sys/dev/acpi/fujbp_acpi.c
index b7af21f0cb0..4bcfc5d5465 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.2 2012/03/15 16:19:02 bouyer Exp $ */
+/* $NetBSD: fujbp_acpi.c,v 1.3 2012/06/02 21:36:43 dsl 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.2 2012/03/15 16:19:02 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fujbp_acpi.c,v 1.3 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -401,7 +401,7 @@ fujitsu_bp_sysctl_setup(struct fujitsu_bp_softc *sc)
(void)sysctl_createv(&sc->sc_log, 0, &rnode, NULL,
access, CTLTYPE_INT, "brightness",
SYSCTL_DESCR("Internal DFP brightness level"),
- fujitsu_bp_sysctl_brightness, 0, sc, 0,
+ fujitsu_bp_sysctl_brightness, 0, (void *)sc, 0,
CTL_CREATE, CTL_EOL);
}
@@ -414,7 +414,7 @@ fujitsu_bp_sysctl_setup(struct fujitsu_bp_softc *sc)
(void)sysctl_createv(&sc->sc_log, 0, &rnode, NULL,
access, CTLTYPE_BOOL, "pointer",
SYSCTL_DESCR("Internal pointer switch state"),
- fujitsu_bp_sysctl_pointer, 0, sc, 0,
+ fujitsu_bp_sysctl_pointer, 0, (void *)sc, 0,
CTL_CREATE, CTL_EOL);
}
diff --git a/sys/dev/acpi/fujhk_acpi.c b/sys/dev/acpi/fujhk_acpi.c
index b8ba399a373..d8eab375eee 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.1 2011/02/20 08:31:46 jruoho Exp $ */
+/* $NetBSD: fujhk_acpi.c,v 1.2 2012/06/02 21:36:43 dsl 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.1 2011/02/20 08:31:46 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fujhk_acpi.c,v 1.2 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -300,7 +300,7 @@ fujitsu_hk_sysctl_setup(struct fujitsu_hk_softc *sc)
(void)sysctl_createv(&sc->sc_log, 0, &rnode, NULL,
CTLFLAG_READWRITE, CTLTYPE_BOOL, "backlight",
SYSCTL_DESCR("Internal DFP backlight switch state"),
- fujitsu_hk_sysctl_backlight, 0, sc, 0,
+ fujitsu_hk_sysctl_backlight, 0, (void *)sc, 0,
CTL_CREATE, CTL_EOL);
}
diff --git a/sys/dev/acpi/sony_acpi.c b/sys/dev/acpi/sony_acpi.c
index c0c7edfb20f..452b6e0142f 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.20 2010/10/02 18:06:47 gsutre Exp $ */
+/* $NetBSD: sony_acpi.c,v 1.21 2012/06/02 21:36:43 dsl 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.20 2010/10/02 18:06:47 gsutre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.21 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -191,7 +191,7 @@ sony_walk_cb(ACPI_HANDLE hnd, uint32_t v, void *context, void **status)
if ((rv = sysctl_createv(&sc->sc_log, 0, &snode, &node,
CTLFLAG_READWRITE, CTLTYPE_INT, buf + 1, NULL,
- sony_sysctl_helper, 0, sc, 0, CTL_CREATE, CTL_EOL)) != 0)
+ sony_sysctl_helper, 0, (void *)sc, 0, CTL_CREATE, CTL_EOL)) != 0)
goto out;
out:
diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c
index 04e6d2c7056..e6cea47ad21 100644
--- a/sys/dev/adb/adb_kbd.c
+++ b/sys/dev/adb/adb_kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_kbd.c,v 1.16 2011/11/16 06:56:49 macallan Exp $ */
+/* $NetBSD: adb_kbd.c,v 1.17 2012/06/02 21:36:43 dsl Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.16 2011/11/16 06:56:49 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.17 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -691,14 +691,14 @@ adbkbd_setup_sysctl(struct adbkbd_softc *sc)
(void *)&node,
CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
CTLTYPE_INT, "middle", "middle mouse button", adbkbd_sysctl_mid,
- 1, sc, 0, CTL_MACHDEP, me->sysctl_num, CTL_CREATE,
+ 1, (void *)sc, 0, CTL_MACHDEP, me->sysctl_num, CTL_CREATE,
CTL_EOL);
ret = sysctl_createv(NULL, 0, NULL,
(void *)&node,
CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
CTLTYPE_INT, "right", "right mouse button", adbkbd_sysctl_right,
- 2, sc, 0, CTL_MACHDEP, me->sysctl_num, CTL_CREATE,
+ 2, (void *)sc, 0, CTL_MACHDEP, me->sysctl_num, CTL_CREATE,
CTL_EOL);
}
diff --git a/sys/dev/adb/adb_ms.c b/sys/dev/adb/adb_ms.c
index ea7ca77bfea..71f1fe5d1e1 100644
--- a/sys/dev/adb/adb_ms.c
+++ b/sys/dev/adb/adb_ms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_ms.c,v 1.12 2011/08/18 02:18:40 christos Exp $ */
+/* $NetBSD: adb_ms.c,v 1.13 2012/06/02 21:36:43 dsl Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.12 2011/08/18 02:18:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.13 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -741,7 +741,7 @@ init_trackpad(struct adbms_softc *sc)
ret = sysctl_createv(NULL, 0, NULL, &node,
CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
CTLTYPE_INT, "tapping", "tapping the pad causes button events",
- sysctl_adbms_tap, 1, sc, 0,
+ sysctl_adbms_tap, 1, (void *)sc, 0,
CTL_MACHDEP, me->sysctl_num, CTL_CREATE, CTL_EOL);
}
diff --git a/sys/dev/bluetooth/bcsp.c b/sys/dev/bluetooth/bcsp.c
index 781412a8404..039ec03155a 100644
--- a/sys/dev/bluetooth/bcsp.c
+++ b/sys/dev/bluetooth/bcsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bcsp.c,v 1.20 2011/07/31 13:51:53 uebayasi Exp $ */
+/* $NetBSD: bcsp.c,v 1.21 2012/06/02 21:36:43 dsl 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.20 2011/07/31 13:51:53 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.21 2012/06/02 21:36:43 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -300,7 +300,7 @@ bcsp_attach(device_t parent __unused, device_t self, void *aux __unused)
}
bcsp_node_num = node->sysctl_num;
if ((rc = sysctl_createv(&sc->sc_log, 0, NULL, &node,
- CTLFLAG_READWRITE, CTLTYPE_INT,
+ CTLFLAG_READWRITE, CTLTYPE_BOOL,
"muzzled", SYSCTL_DESCR("muzzled for Link-establishment Layer"),
NULL, 0, &sc->sc_le_muzzled,
0, CTL_HW, bcsp_node_num, CTL_CREATE, CTL_EOL)) != 0) {
diff --git a/sys/dev/bluetooth/btmagic.c b/sys/dev/bluetooth/btmagic.c
index 3394ef5d51d..5d550647339 100644
--- a/sys/dev/bluetooth/btmagic.c
+++ b/sys/dev/bluetooth/btmagic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btmagic.c,v 1.2 2012/04/03 09:32:53 plunky Exp $ */
+/* $NetBSD: btmagic.c,v 1.3 2012/06/02 21:36:43 dsl Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.2 2012/04/03 09:32:53 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.3 2012/06/02 21:36:43 dsl Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -342,7 +342,7 @@ btmagic_attach(device_t parent, device_t self, void *aux)
CTLTYPE_INT, "soft_resolution",
NULL,
btmagic_sysctl_resolution, 0,
- sc, 0,
+ (void *)sc, 0,
CTL_HW, node->sysctl_num,
CTL_CREATE, CTL_EOL);
@@ -369,7 +369,7 @@ btmagic_attach(device_t parent, device_t self, void *aux)
CTLTYPE_INT, "scroll_downscale_factor",
NULL,
btmagic_sysctl_scale, 0,
- sc, 0,
+ (void *)sc, 0,
CTL_HW, node->sysctl_num,
CTL_CREATE, CTL_EOL);
}
diff --git a/sys/dev/gpio/gpiopwm.c b/sys/dev/gpio/gpiopwm.c
index ac76b35d404..8cd8fc6965e 100644
--- a/sys/dev/gpio/gpiopwm.c
+++ b/sys/dev/gpio/gpiopwm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiopwm.c,v 1.2 2011/11/13 13:16:33 mbalmer Exp $ */
+/* $NetBSD: gpiopwm.c,v 1.3 2012/06/02 21:36:43 dsl Exp $ */
/*
* Copyright (c) 2011 Marc Balmer <marc@msys.ch>
@@ -130,13 +130,13 @@ gpiopwm_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "on",
SYSCTL_DESCR("PWM 'on' period in ticks"),
- gpiopwm_set_on, 0, sc, 0,
+ gpiopwm_set_on, 0, (void *)sc, 0,
CTL_CREATE, CTL_EOL);
sysctl_createv(&sc->sc_log, 0, &node, NULL,
CTLFLAG_READWRITE,
CTLTYPE_INT, "off",
SYSCTL_DESCR("PWM 'off' period in ticks"),
- gpiopwm_set_off, 0, sc, 0,
+ gpiopwm_set_off, 0, (void *)sc, 0,
CTL_CREATE, CTL_EOL);
aprint_normal("\n");
diff --git a/sys/dev/gpio/gpiosim.c b/sys/dev/gpio/gpiosim.c
index e675fadba68..bd26509ac18 100644
--- a/sys/dev/gpio/gpiosim.c
+++ b/sys/dev/gpio/gpiosim.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiosim.c,v 1.13 2011/08/30 07:22:12 mbalmer Exp $ */
+/* $NetBSD: gpiosim.c,v 1.14 2012/06/02 21:36:44 dsl Exp $ */
/* $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $ */
/*
@@ -142,7 +142,7 @@ gpiosim_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "value",
SYSCTL_DESCR("Current GPIO simulator value"),
- gpiosim_sysctl, 0, sc, 0,
+ gpiosim_sysctl, 0, (void *)sc, 0,
CTL_CREATE, CTL_EOL);
printf(": simulating %d pins\n", GPIOSIM_NPINS);
diff --git a/sys/dev/i2c/dbcool.c b/sys/dev/i2c/dbcool.c
index f72fec5e306..140bd86f7dc 100644
--- a/sys/dev/i2c/dbcool.c
+++ b/sys/dev/i2c/dbcool.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.37 2012/05/31 16:09:33 pgoyette Exp $ */
+/* $NetBSD: dbcool.c,v 1.38 2012/06/02 21:36:44 dsl Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.37 2012/05/31 16:09:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.38 2012/06/02 21:36:44 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1549,7 +1549,7 @@ dbcool_setup(device_t self)
(void *)&node,
CTLFLAG_READWRITE, CTLTYPE_INT, "reg_select", NULL,
sysctl_dbcool_reg_select,
- 0, sc, sizeof(int),
+ 0, (void *)sc, sizeof(int),
CTL_HW, me->sysctl_num, CTL_CREATE, CTL_EOL);
if (node != NULL)
node->sysctl_data = sc;
@@ -1558,7 +1558,7 @@ dbcool_setup(device_t self)
(void *)&node,
CTLFLAG_READWRITE, CTLTYPE_INT, "reg_access", NULL,
sysctl_dbcool_reg_access,
- 0, sc, sizeof(int),
+ 0, (void *)sc, sizeof(int),
CTL_HW, me->sysctl_num, CTL_CREATE, CTL_EOL);
if (node != NULL)
node->sysctl_data = sc;
@@ -1741,7 +1741,7 @@ dbcool_attach_temp_control(struct dbcool_softc *sc, int idx,
CTLTYPE_INT, name,
SYSCTL_DESCR(dbc_sysctl_table[sysctl_index].desc),
dbc_sysctl_table[sysctl_index].helper,
- 0, sc, sizeof(int),
+ 0, (void *)sc, sizeof(int),
CTL_HW, sc->sc_root_sysctl_num,
sc->sc_sysctl_num[j],
DBC_PWM_SYSCTL(idx, sysctl_reg), CTL_EOL);
@@ -1779,7 +1779,7 @@ dbcool_setup_controllers(struct dbcool_softc *sc)
rw_flag = CTLFLAG_READONLY | CTLFLAG_OWNDESC;
else
rw_flag = CTLFLAG_READWRITE | CTLFLAG_OWNDESC;
- ret = sysctl_createv(&sc->sc_sysctl_log, 0, NULL,
+ ret = (sysctl_createv)(&sc->sc_sysctl_log, 0, NULL,
&node, rw_flag,
(j == DBC_PWM_BEHAVIOR)?
CTLTYPE_STRING:CTLTYPE_INT,
diff --git a/sys/dev/i2c/lm75.c b/sys/dev/i2c/lm75.c
index cad0d9b2347..47999f89a6c 100644
--- a/sys/dev/i2c/lm75.c
+++ b/sys/dev/i2c/lm75.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lm75.c,v 1.23 2011/11/09 05:47:54 macallan Exp $ */
+/* $NetBSD: lm75.c,v 1.24 2012/06/02 21:36:44 dsl Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.23 2011/11/09 05:47:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.24 2012/06/02 21:36:44 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -363,7 +363,7 @@ lmtemp_setup_sysctl(struct lmtemp_softc *sc)
sysctl_createv(NULL, 0, NULL, &node,
CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
CTLTYPE_INT, "temp", "Threshold temperature",
- sysctl_lm75_temp, 1, sc, 0,
+ sysctl_lm75_temp, 1, (void *)sc, 0,
CTL_MACHDEP, me->sysctl_num, CTL_CREATE, CTL_EOL);
}
diff --git a/sys/dev/ic/ac97.c b/sys/dev/ic/ac97.c
index b820ebbe41c..da22acfedeb 100644
--- a/sys/dev/ic/ac97.c
+++ b/sys/dev/ic/ac97.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ac97.c,v 1.93 2011/11/27 15:08:04 mbalmer Exp $ */
+/* $NetBSD: ac97.c,v 1.94 2012/06/02 21:36:44 dsl Exp $ */
/* $OpenBSD: ac97.c,v 1.8 2000/07/19 09:01:35 csapuntz Exp $ */
/*
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.93 2011/11/27 15:08:04 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.94 2012/06/02 21:36:44 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1522,7 +1522,7 @@ setup_modem:
CTLFLAG_READWRITE, CTLTYPE_INT,
"line1",
SYSCTL_DESCR("off-hook line1"),
- ac97_sysctl_verify, 0, as, 0,
+ ac97_sysctl_verify, 0, (void *)as, 0,
CTL_HW, node->sysctl_num,
CTL_CREATE, CTL_EOL);
mutex_enter(as->lock);
@@ -1544,7 +1544,7 @@ setup_modem:
CTLFLAG_READWRITE, CTLTYPE_INT,
"line2",
SYSCTL_DESCR("off-hook line2"),
- ac97_sysctl_verify, 0, as, 0,
+ ac97_sysctl_verify, 0, (void *)as, 0,
CTL_HW, node->sysctl_num,
CTL_CREATE, CTL_EOL);
mutex_enter(as->lock);
diff --git a/sys/dev/ic/ath_netbsd.h b/sys/dev/ic/ath_netbsd.h
index a1ca0f17185..22cb58f1e6d 100644
--- a/sys/dev/ic/ath_netbsd.h
+++ b/sys/dev/ic/ath_netbsd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ath_netbsd.h,v 1.12 2011/10/07 16:58:11 dyoung Exp $ */
+/* $NetBSD: ath_netbsd.h,v 1.13 2012/06/02 21:36:44 dsl Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young
@@ -71,7 +71,7 @@ typedef kmutex_t ath_txbuf_lock_t;
#define SYSCTL_INT_SUBR(__rw, __name, __descr) \
sysctl_createv(log, 0, &rnode, &cnode, CTLFLAG_PERMANENT|(__rw), \
CTLTYPE_INT, #__name, SYSCTL_DESCR(__descr), ath_sysctl_##__name,\
- 0, sc, 0, CTL_CREATE, CTL_EOL)
+ 0, (void *)sc, 0, CTL_CREATE, CTL_EOL)
#define __PFX(__pfx, __name) __pfx##__name
diff --git a/sys/dev/isa/toaster.c b/sys/dev/isa/toaster.c
index 209c58bebfb..7bdd5822910 100644
--- a/sys/dev/isa/toaster.c
+++ b/sys/dev/isa/toaster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: toaster.c,v 1.11 2012/02/12 16:34:11 matt Exp $ */
+/* $NetBSD: toaster.c,v 1.12 2012/06/02 21:36:44 dsl 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.11 2012/02/12 16:34:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.12 2012/06/02 21:36:44 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -287,7 +287,7 @@ toaster_attach(device_t parent, device_t self, void *aux)
"led" #x "_width", \
SYSCTL_DESCR( \
"LED cycle width in HZ tick units"), \
- led_sysctl, 0, &sc->led_width[(x)], 0, \
+ led_sysctl, 0, (void *)&sc->led_width[(x)], 0, \
CTL_HW, node->sysctl_num, \
CTL_CREATE, CTL_EOL)) \
!= 0) { \
@@ -307,7 +307,7 @@ toaster_attach(device_t parent, device_t self, void *aux)
"magnetic_latch",
SYSCTL_DESCR(
"magnetic latch that holds the toast down"),
- latch_sysctl, 0, &sc->latch, 0,
+ latch_sysctl, 0, (void *)&sc->latch, 0,
CTL_HW, node->sysctl_num,
CTL_CREATE, CTL_EOL))
!= 0) {
@@ -320,7 +320,7 @@ toaster_attach(device_t parent, device_t self, void *aux)
"burner_element",
SYSCTL_DESCR(
"800-watt burner element control for toasting"),
- burner_sysctl, 0, &sc->burner, 0,
+ burner_sysctl, 0, (void *)&sc->burner, 0,
CTL_HW, node->sysctl_num,
CTL_CREATE, CTL_EOL))
!= 0) {
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 0802e962710..6fa5f3e0bd5 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.140 2011/11/24 03:35:58 mrg Exp $ */
+/* $NetBSD: auich.c,v 1.141 2012/06/02 21:36:44 dsl 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.140 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.141 2012/06/02 21:36:44 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -676,7 +676,7 @@ map_done:
CTLFLAG_READWRITE,
CTLTYPE_INT, "ac97rate",
SYSCTL_DESCR("AC'97 codec link rate"),
- auich_sysctl_verify, 0, sc, 0,
+ auich_sysctl_verify, 0, (void *)sc, 0,
CTL_HW, node_mib, CTL_CREATE, CTL_EOL);
if (err != 0)
goto sysctl_err;
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 256c3bf174c..983242fa2c5 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.90 2012/03/21 00:29:39 nisimura Exp $ */
+/* $NetBSD: if_iwi.c,v 1.91 2012/06/02 21:36:44 dsl 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.90 2012/03/21 00:29:39 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.91 2012/06/02 21:36:44 dsl Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -2830,7 +2830,7 @@ iwi_sysctlattach(struct iwi_softc *sc)
if ((rc = sysctl_createv(clog, 0, &rnode, &cnode,
CTLFLAG_PERMANENT, CTLTYPE_INT, "radio",
SYSCTL_DESCR("radio transmitter switch state (0=off, 1=on)"),
- iwi_sysctl_radio, 0, sc, 0, CTL_CREATE, CTL_EOL)) != 0)
+ iwi_sysctl_radio, 0, (void *)sc, 0, CTL_CREATE, CTL_EOL)) != 0)
goto err;
sc->dwelltime = 100;
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 86903888d5d..4757d153fe7 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.19 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_jme.c,v 1.20 2012/06/02 21:36:44 dsl 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.19 2012/02/02 19:43:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.20 2012/06/02 21:36:44 dsl Exp $");
#include <sys/param.h>
@@ -530,7 +530,7 @@ jme_pci_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "int_rxto",
SYSCTL_DESCR("jme RX interrupt moderation timer"),
- jme_sysctl_intrxto, 0, sc,
+ jme_sysctl_intrxto, 0, (void *)sc,
0, CTL_HW, jme_root_num, jme_nodenum, CTL_CREATE,
CTL_EOL) != 0) {
aprint_normal_dev(sc->jme_dev,
@@ -540,7 +540,7 @@ jme_pci_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "int_rxct",
SYSCTL_DESCR("jme RX interrupt moderation packet counter"),
- jme_sysctl_intrxct, 0, sc,
+ jme_sysctl_intrxct, 0, (void *)sc,
0, CTL_HW, jme_root_num, jme_nodenum, CTL_CREATE,
CTL_EOL) != 0) {
aprint_normal_dev(sc->jme_dev,
@@ -550,7 +550,7 @@ jme_pci_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "int_txto",
SYSCTL_DESCR("jme TX interrupt moderation timer"),
- jme_sysctl_inttxto, 0, sc,
+ jme_sysctl_inttxto, 0, (void *)sc,
0, CTL_HW, jme_root_num, jme_nodenum, CTL_CREATE,
CTL_EOL) != 0) {
aprint_normal_dev(sc->jme_dev,
@@ -560,7 +560,7 @@ jme_pci_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "int_txct",
SYSCTL_DESCR("jme TX interrupt moderation packet counter"),
- jme_sysctl_inttxct, 0, sc,
+ jme_sysctl_inttxct, 0, (void *)sc,
0, CTL_HW, jme_root_num, jme_nodenum, CTL_CREATE,
CTL_EOL) != 0) {
aprint_normal_dev(sc->jme_dev,
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index b5e906b7304..396acf99752 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.39 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_msk.c,v 1.40 2012/06/02 21:36:44 dsl 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.39 2012/02/02 19:43:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.40 2012/06/02 21:36:44 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1440,7 +1440,7 @@ mskc_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "int_mod",
SYSCTL_DESCR("msk interrupt moderation timer"),
- msk_sysctl_handler, 0, sc,
+ msk_sysctl_handler, 0, (void *)sc,
0, CTL_HW, msk_root_num, sk_nodenum, CTL_CREATE,
CTL_EOL)) != 0) {
aprint_normal_dev(sc->sk_dev, "couldn't create int_mod sysctl node\n");
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 6787422eb5d..257d536dc68 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.70 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_sk.c,v 1.71 2012/06/02 21:36:45 dsl 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.70 2012/02/02 19:43:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.71 2012/06/02 21:36:45 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1829,7 +1829,7 @@ skc_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "int_mod",
SYSCTL_DESCR("sk interrupt moderation timer"),
- sk_sysctl_handler, 0, sc,
+ sk_sysctl_handler, 0, (void *)sc,
0, CTL_HW, sk_root_num, sk_nodenum, CTL_CREATE,
CTL_EOL)) != 0) {
aprint_normal_dev(sc->sk_dev, "couldn't create int_mod sysctl node\n");
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index d9740fd4c9a..0ed4206d81e 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.5 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_vte.c,v 1.6 2012/06/02 21:36:45 dsl 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.5 2012/02/02 19:43:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.6 2012/06/02 21:36:45 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,7 +290,7 @@ vte_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "int_rxct",
SYSCTL_DESCR("vte RX interrupt moderation packet counter"),
- vte_sysctl_intrxct, 0, sc,
+ vte_sysctl_intrxct, 0, (void *)sc,
0, CTL_HW, vte_root_num, vte_nodenum, CTL_CREATE,
CTL_EOL) != 0) {
aprint_normal_dev(sc->vte_dev,
@@ -300,7 +300,7 @@ vte_attach(device_t parent, device_t self, void *aux)
CTLFLAG_READWRITE,
CTLTYPE_INT, "int_txct",
SYSCTL_DESCR("vte TX interrupt moderation packet counter"),
- vte_sysctl_inttxct, 0, sc,
+ vte_sysctl_inttxct, 0, (void *)sc,
0, CTL_HW, vte_root_num, vte_nodenum, CTL_CREATE,
CTL_EOL) != 0) {
aprint_normal_dev(sc->vte_dev,
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 754382fa5fa..48d5ebb39d5 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.51 2012/05/12 13:40:21 khorben Exp $ */
+/* $NetBSD: if_wpi.c,v 1.52 2012/06/02 21:36:45 dsl Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.51 2012/05/12 13:40:21 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.52 2012/06/02 21:36:45 dsl Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -3252,7 +3252,7 @@ wpi_sysctlattach(struct wpi_softc *sc)
if ((rc = sysctl_createv(clog, 0, &rnode, &cnode,
CTLFLAG_PERMANENT, CTLTYPE_INT, "radio",
SYSCTL_DESCR("radio transmitter switch state (0=off, 1=on)"),
- wpi_sysctl_radio, 0, sc, 0, CTL_CREATE, CTL_EOL)) != 0)
+ wpi_sysctl_radio, 0, (void *)sc, 0, CTL_CREATE, CTL_EOL)) != 0)
goto err;
#ifdef WPI_DEBUG
diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c
index 475047aa3ec..b7ab517de1c 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.2 2011/11/19 22:51:24 tls Exp $*/
+/*$NetBSD: ixgbe.c,v 1.3 2012/06/02 21:36:45 dsl Exp $*/
#include "opt_inet.h"
@@ -426,13 +426,13 @@ ixgbe_sysctl_attach(struct adapter *adapter)
if (sysctl_createv(log, 0, &rnode, &cnode,
CTLFLAG_READWRITE, CTLTYPE_INT,
"flow_control", SYSCTL_DESCR("Flow Control"),
- ixgbe_set_flowcntl, 0, adapter, 0, CTL_CREATE, CTL_EOL) != 0)
+ ixgbe_set_flowcntl, 0, (void *)adapter, 0, CTL_CREATE, CTL_EOL) != 0)
aprint_error_dev(dev, "could not create sysctl\n");
if (sysctl_createv(log, 0, &rnode, &cnode,
CTLFLAG_READWRITE, CTLTYPE_INT,
"advertise_gig", SYSCTL_DESCR("1G Link"),
- ixgbe_set_advertise, 0, adapter, 0, CTL_CREATE, CTL_EOL) != 0)
+ ixgbe_set_advertise, 0, (void *)adapter, 0, CTL_CREATE, CTL_EOL) != 0)
aprint_error_dev(dev, "could not create sysctl\n");
/* XXX This is an *instance* sysctl controlling a *global* variable.
diff --git a/sys/dev/pci/voyager/pwmclock.c b/sys/dev/pci/voyager/pwmclock.c
index 399f6f1a599..007bfdf1111 100644
--- a/sys/dev/pci/voyager/pwmclock.c
+++ b/sys/dev/pci/voyager/pwmclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pwmclock.c,v 1.5 2012/02/23 07:49:42 macallan Exp $ */
+/* $NetBSD: pwmclock.c,v 1.6 2012/06/02 21:36:45 dsl Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.5 2012/02/23 07:49:42 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.6 2012/06/02 21:36:45 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -199,7 +199,7 @@ pwmclock_attach(device_t parent, device_t self, void *aux)
&sysctl_node,
CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
CTLTYPE_INT, "target", "CPU speed", pwmclock_cpuspeed_temp,
- 0, sc, 0, CTL_MACHDEP, me->sysctl_num, freq->sysctl_num,
+ 0, (void *)sc, 0, CTL_MACHDEP, me->sysctl_num, freq->sysctl_num,
CTL_CREATE, CTL_EOL) == 0) {
} else
aprint_error_dev(sc->sc_dev,
@@ -209,7 +209,7 @@ pwmclock_attach(device_t parent, device_t self, void *aux)
&sysctl_node,
CTLFLAG_READWRITE,
CTLTYPE_INT, "current", NULL, pwmclock_cpuspeed_cur,
- 1, sc, 0, CTL_MACHDEP, me->sysctl_num, freq->sysctl_num,
+ 1, (void *)sc, 0, CTL_MACHDEP, me->sysctl_num, freq->sysctl_num,
CTL_CREATE, CTL_EOL) == 0) {
} else
aprint_error_dev(sc->sc_dev,
@@ -219,7 +219,7 @@ pwmclock_attach(device_t parent, device_t self, void *aux)
&sysctl_node,
CTLFLAG_READWRITE,
CTLTYPE_STRING, "available", NULL, pwmclock_cpuspeed_available,
- 2, sc, 0, CTL_MACHDEP, me->sysctl_num, freq->sysctl_num,
+ 2, (void *)sc, 0, CTL_MACHDEP, me->sysctl_num, freq->sysctl_num,
CTL_CREATE, CTL_EOL) == 0) {
} else
aprint_error_dev(sc->sc_dev,
diff --git a/sys/dev/pckbport/synaptics.c b/sys/dev/pckbport/synaptics.c
index 50949fac149..a623a18eb7e 100644
--- a/sys/dev/pckbport/synaptics.c
+++ b/sys/dev/pckbport/synaptics.c
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.28 2011/09/10 18:38:20 jakllsch Exp $ */
+/* $NetBSD: synaptics.c,v 1.29 2012/06/02 21:36:45 dsl 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.28 2011/09/10 18:38:20 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.29 2012/06/02 21:36:45 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -493,7 +493,7 @@ pms_sysctl_synaptics(struct sysctllog **clog)
CTLTYPE_INT, "scale_x",
SYSCTL_DESCR("Horizontal movement scale factor"),
pms_sysctl_synaptics_verify, 0,
- &synaptics_scale_x,
+ (void *)&synaptics_scale_x,
0, CTL_HW, root_num, CTL_CREATE,
CTL_EOL)) != 0)
goto err;
@@ -505,7 +505,7 @@ pms_sysctl_synaptics(struct sysctllog **clog)
CTLTYPE_INT, "scale_y",
SYSCTL_DESCR("Vertical movement scale factor"),
pms_sysctl_synaptics_verify, 0,
- &synaptics_scale_y,
+ (void *)&synaptics_scale_y,
0, CTL_HW, root_num, CTL_CREATE,
CTL_EOL)) != 0)
goto err;
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c
index dd659e59f04..18bf8f9bddb 100644
--- a/sys/dev/usb/ubt.c
+++ b/sys/dev/usb/ubt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt.c,v 1.47 2012/04/24 20:04:49 christos Exp $ */
+/* $NetBSD: ubt.c,v 1.48 2012/06/02 21:36:45 dsl Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.47 2012/04/24 20:04:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.48 2012/06/02 21:36:45 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -500,7 +500,7 @@ ubt_attach(device_t parent, device_t self, void *aux)
CTLTYPE_INT, "config",
SYSCTL_DESCR("configuration number"),
ubt_sysctl_config, 0,
- sc, 0,
+ (void *)sc, 0,
CTL_HW, node->sysctl_num,
CTL_CREATE, CTL_EOL);