Module Name: src
Committed By: mlelstv
Date: Sun Jul 29 07:04:10 UTC 2012
Modified Files:
src/sys/dev/i2c: g760a.c
Log Message:
Use const nodes. Let sysctl_createv initialize sysctl_data.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/g760a.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/g760a.c
diff -u src/sys/dev/i2c/g760a.c:1.3 src/sys/dev/i2c/g760a.c:1.4
--- src/sys/dev/i2c/g760a.c:1.3 Sat Jul 28 23:03:47 2012
+++ src/sys/dev/i2c/g760a.c Sun Jul 29 07:04:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: g760a.c,v 1.3 2012/07/28 23:03:47 matt Exp $ */
+/* $NetBSD: g760a.c,v 1.4 2012/07/29 07:04:09 mlelstv Exp $ */
/*-
* Copyright (C) 2008 A.Leo.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g760a.c,v 1.3 2012/07/28 23:03:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g760a.c,v 1.4 2012/07/29 07:04:09 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -218,11 +218,11 @@ g760a_setup(struct g760a_softc* sc)
{
int error;
int ret;
- struct sysctlnode* me = NULL, * node = NULL;
+ const struct sysctlnode *me, *node;
sc->sc_sme = sysmon_envsys_create();
- ret = sysctl_createv(NULL, 0, NULL, (void *)&me,
+ ret = sysctl_createv(NULL, 0, NULL, &me,
CTLFLAG_READWRITE,
CTLTYPE_NODE, device_xname(sc->sc_dev), NULL,
NULL, 0, NULL, 0,
@@ -236,13 +236,11 @@ g760a_setup(struct g760a_softc* sc)
if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor))
goto out;
- ret = sysctl_createv(NULL, 0, NULL, (void *)&node,
+ ret = sysctl_createv(NULL, 0, NULL, &node,
CTLFLAG_READWRITE,
CTLTYPE_INT, "rpm", sc->sc_sensor.desc,
- sysctl_g760a_rpm, 0x42, NULL, 0,
+ sysctl_g760a_rpm, 0x42, (void*)sc, 0,
CTL_MACHDEP, me->sysctl_num, CTL_CREATE, CTL_EOL);
- if (node != NULL)
- node->sysctl_data = sc;
sc->sc_sme->sme_name = device_xname(sc->sc_dev);
sc->sc_sme->sme_cookie = sc;
