 @@ -1,14 +1,14 @@
-/*	$NetBSD: dbcool.c,v 1.38 2012/06/02 21:36:44 dsl Exp $ */
+/*	$NetBSD: dbcool.c,v 1.39 2013/09/12 19:46:31 martin 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.38 2012/06/02 21:36:44 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.39 2013/09/12 19:46:31 martin 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 */
 @@ -826,41 +826,40 @@ bool dbcool_pmf_suspend(device_t dev, co
 		bit = DBCOOL_ADT7466_CFG2_SHDN;
 	} else {
 		reg = DBCOOL_CONFIG2_REG;
 		bit = DBCOOL_CFG2_SHDN;
+	}
 	cfg = sc->sc_dc.dc_readreg(&sc->sc_dc, reg);
 	sc->sc_suspend = cfg & bit;
 	cfg |= bit;
 	sc->sc_dc.dc_writereg(&sc->sc_dc, reg, cfg);
 	return true;
+}
-/* On resume, we restore the previous state of the SHDN bit */
+/* On resume, we restore the previous state of the SHDN bit (which
    we saved in sc_suspend) */
 bool dbcool_pmf_resume(device_t dev, const pmf_qual_t *qual)
+{
 	struct dbcool_softc *sc = device_private(dev);
-	uint8_t reg, bit, cfg;
+	uint8_t reg, cfg;
 	if ((sc->sc_dc.dc_chip->flags & DBCFLAG_HAS_SHDN) == 0)
 		return true;
 	if (sc->sc_dc.dc_chip->flags & DBCFLAG_ADT7466) {
 		reg = DBCOOL_ADT7466_CONFIG2;
 		bit = DBCOOL_ADT7466_CFG2_SHDN;
 	} else {
 		reg = DBCOOL_CONFIG2_REG;
 		bit = DBCOOL_CFG2_SHDN;
+	}
 	cfg = sc->sc_dc.dc_readreg(&sc->sc_dc, reg);
 	cfg &= ~sc->sc_suspend;
 	sc->sc_dc.dc_writereg(&sc->sc_dc, reg, cfg);
 	return true;
+}
 uint8_t
 dbcool_readreg(struct dbcool_chipset *dc, uint8_t reg)
+{
 	uint8_t data = 0;
 @@ -1742,54 +1741,54 @@ dbcool_attach_temp_control(struct dbcool
 			     SYSCTL_DESCR(dbc_sysctl_table[sysctl_index].desc),
 			     dbc_sysctl_table[sysctl_index].helper,
 , (void *)sc, sizeof(int),
 			     CTL_HW, sc->sc_root_sysctl_num,
 				sc->sc_sysctl_num[j],
 				DBC_PWM_SYSCTL(idx, sysctl_reg), CTL_EOL);
 	return ret;
+}
 static void
 dbcool_setup_controllers(struct dbcool_softc *sc)
+{
-	int i, j, ret, rw_flag;
+	int i, j, rw_flag;
 	uint8_t sysctl_reg;
 	struct chip_id *chip = sc->sc_dc.dc_chip;
 	const struct sysctlnode *me2 = 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(&sc->sc_sysctl_log, 0, NULL, &me2,
+		sysctl_createv(&sc->sc_sysctl_log, 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)(&sc->sc_sysctl_log, 0, NULL,
+			(sysctl_createv)(&sc->sc_sysctl_log, 0, NULL,
 				&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);
+		}
+	}