 @@ -1,14 +1,14 @@
-/*	$NetBSD: dbcool.c,v 1.30 2011/06/20 20:16:19 pgoyette Exp $ */
+/*	$NetBSD: dbcool.c,v 1.31 2011/07/31 16:05:01 jmcneill 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,34 +40,35 @@
  *	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.30 2011/06/20 20:16:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.31 2011/07/31 16:05:01 jmcneill 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 */
 static int dbcool_match(device_t, cfdata_t, void *);
 static void dbcool_attach(device_t, device_t, void *);
 static int dbcool_detach(device_t, int);
 /* Device attributes */
 static int dbcool_supply_voltage(struct dbcool_softc *);
 static bool dbcool_islocked(struct dbcool_softc *);
 @@ -784,26 +785,28 @@ dbcool_attach(device_t parent, device_t
 			"(rev 0x%04x)\n", sc->sc_dc.dc_chip->name, ver);
 	dbcool_setup(self);
 	if (!pmf_device_register(self, dbcool_pmf_suspend, dbcool_pmf_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 static int
 dbcool_detach(device_t self, int flags)
+{
 	struct dbcool_softc *sc = device_private(self);
 	pmf_device_deregister(self);
 	sysmon_envsys_unregister(sc->sc_sme);
 	sc->sc_sme = NULL;
 	return 0;
+}
 /* On suspend, we save the state of the SHDN bit, then set it */
 bool dbcool_pmf_suspend(device_t dev, const pmf_qual_t *qual)
+{
 	struct dbcool_softc *sc = device_private(dev);
 	uint8_t reg, bit, cfg;
 	if ((sc->sc_dc.dc_chip->flags && DBCFLAG_HAS_SHDN) == 0)
 		return true;
 @@ -2149,13 +2152,42 @@ dbcool_set_fan_limits(struct dbcool_soft
 			if (limit > 0xffff)
 				limit = 0xffff;
+		}
 		sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg,
 				      limit & 0xff);
 		limit >>= 8;
 		sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg + 1,
 				      limit & 0xff);
 	} else if (*props & PROP_DRIVER_LIMITS) {
 		sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg, 0xff);
 		sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg + 1, 0xff);
+	}
+}
 MODULE(MODULE_CLASS_DRIVER, dbcool, NULL);
 #ifdef _MODULE
 #include "ioconf.c"
 #endif
 static int
 dbcool_modcmd(modcmd_t cmd, void *opaque)
+{
 	int error = 0;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 #ifdef _MODULE
 		error = config_init_component(cfdriver_ioconf_dbcool,
 		    cfattach_ioconf_dbcool, cfdata_ioconf_dbcool);
 #endif
 		return error;
 	case MODULE_CMD_FINI:
 #ifdef _MODULE
 		error = config_fini_component(cfdriver_ioconf_dbcool,
 		    cfattach_ioconf_dbcool, cfdata_ioconf_dbcool);
 #endif
 		return error;
 	default:
 		return ENOTTY;
+	}
+}