 @@ -1,14 +1,14 @@
-/*	$NetBSD: dbcool.c,v 1.31 2011/07/31 16:05:01 jmcneill Exp $ */
+/*	$NetBSD: dbcool.c,v 1.32 2011/08/01 22:42:57 macallan Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -40,27 +40,27 @@
  *	http://www.onsemi.com/pub/Collateral/ADT7466.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7467-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7468-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7473-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7475-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7476-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7490-D.PDF
  *	http://www.smsc.com/media/Downloads_Public/Data_Sheets/6d103s.pdf
+ *
  * (URLs are correct as of October 5, 2008)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.31 2011/07/31 16:05:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.32 2011/08/01 22:42:57 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/module.h>
 #include <dev/i2c/dbcool_var.h>
 #include <dev/i2c/dbcool_reg.h>
 /* Config interface */
 @@ -1677,28 +1677,27 @@ dbcool_attach_sensor(struct dbcool_softc
 	strlcpy(sc->sc_sensor[idx].desc, dbc_sensor_names[name_index],
 		sizeof(sc->sc_sensor[idx].desc));
 	sc->sc_regs[idx] = &sc->sc_dc.dc_chip->table[idx].reg;
 	sc->sc_nom_volt[idx] = sc->sc_dc.dc_chip->table[idx].nom_volt_index;
 	error = sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor[idx]);
 	return error;
+}
 static int
 dbcool_attach_temp_control(struct dbcool_softc *sc, int idx,
 			   struct chip_id *chip)
+{
-	const struct sysctlnode *me2 = NULL;
+	const struct sysctlnode *me2 = NULL, *node;
 	struct sysctlnode *node = NULL;
 	int j, ret, sysctl_index, rw_flag;
 	uint8_t	sysctl_reg;
 	char name[SYSCTL_NAMELEN];
 	/* Search for the corresponding temp sensor */
 	for (j = 0; j < idx; j++) {
 		if (j >= DBCOOL_MAXSENSORS || chip->table[j].type != DBC_TEMP)
 			continue;
 		if (chip->table[j].name_index == chip->table[idx].name_index)
 			break;
+	}
 	if (j >= idx)	/* Temp sensor not found */
 		return ENOENT;
 @@ -1713,85 +1712,82 @@ dbcool_attach_temp_control(struct dbcool
 		if (me2 != NULL)
 			sc->sc_sysctl_num[j] = me2->sysctl_num;
 		else
 			return ret;
+	}
 	/* add sysctl leaf node for this control variable */
 	sysctl_index = chip->table[idx].sysctl_index;
 	sysctl_reg = chip->table[idx].reg.val_reg;
 	strlcpy(name, dbc_sysctl_table[sysctl_index].name, sizeof(name));
 	if (dbc_sysctl_table[sysctl_index].lockable && dbcool_islocked(sc))
 		rw_flag = CTLFLAG_READONLY | CTLFLAG_OWNDESC;
 	else
 		rw_flag = CTLFLAG_READWRITE | CTLFLAG_OWNDESC;
 	ret = sysctl_createv(NULL, 0, NULL,
-			     (const struct sysctlnode **)&node, rw_flag,
+			     &node, rw_flag,
 			     CTLTYPE_INT, name,
 			     SYSCTL_DESCR(dbc_sysctl_table[sysctl_index].desc),
 			     dbc_sysctl_table[sysctl_index].helper,
 , sc, sizeof(int),
 			     CTL_HW, sc->sc_root_sysctl_num,
 				sc->sc_sysctl_num[j],
 				DBC_PWM_SYSCTL(idx, sysctl_reg), CTL_EOL);
 	if (node != NULL)
 		node->sysctl_data = sc;
 	return ret;
+}
 static void
 dbcool_setup_controllers(struct dbcool_softc *sc)
+{
 	int i, j, ret, rw_flag;
 	uint8_t sysctl_reg;
 	struct chip_id *chip = sc->sc_dc.dc_chip;
 	const struct sysctlnode *me2 = NULL;
-	struct sysctlnode *node = NULL;
+	const struct sysctlnode *node = NULL;
 	char name[SYSCTL_NAMELEN];
 	for (i = 0; chip->power[i].desc != NULL; i++) {
 		snprintf(name, sizeof(name), "fan_ctl_%d", i);
 		ret = sysctl_createv(NULL, 0, NULL, &me2,
 		       CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
 		       CTLTYPE_NODE, name, NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_HW, sc->sc_root_sysctl_num, CTL_CREATE, CTL_EOL);
 		for (j = DBC_PWM_BEHAVIOR; j < DBC_PWM_LAST_PARAM; j++) {
 			if (j == DBC_PWM_MAX_DUTY &&
 			    (chip->flags & DBCFLAG_HAS_MAXDUTY) == 0)
 				continue;
 			sysctl_reg = chip->power[i].power_regs[j];
 			if (sysctl_reg == DBCOOL_NO_REG)
 				continue;
 			strlcpy(name, dbc_sysctl_table[j].name, sizeof(name));
 			if (dbc_sysctl_table[j].lockable && dbcool_islocked(sc))
 				rw_flag = CTLFLAG_READONLY | CTLFLAG_OWNDESC;
 			else
 				rw_flag = CTLFLAG_READWRITE | CTLFLAG_OWNDESC;
 			ret = sysctl_createv(NULL, 0, NULL,
-				(const struct sysctlnode **)&node, rw_flag,
+				&node, rw_flag,
 				(j == DBC_PWM_BEHAVIOR)?
 					CTLTYPE_STRING:CTLTYPE_INT,
 				name,
 				SYSCTL_DESCR(dbc_sysctl_table[j].desc),
 				dbc_sysctl_table[j].helper,
 , sc,
 				( j == DBC_PWM_BEHAVIOR)?
 					sizeof(dbcool_cur_behav): sizeof(int),
 				CTL_HW, sc->sc_root_sysctl_num, me2->sysctl_num,
 				DBC_PWM_SYSCTL(j, sysctl_reg), CTL_EOL);
 			if (node != NULL)
 				node->sysctl_data = sc;
+		}
+	}
+}
 static void
 dbcool_refresh(struct sysmon_envsys *sme, envsys_data_t *edata)
+{
 	struct dbcool_softc *sc=sme->sme_cookie;
 	int i, nom_volt_idx, cur;
 	struct reg_list *reg;
 	i = edata->sensor;
 	reg = sc->sc_regs[i];