 @@ -1,14 +1,14 @@
-/*	$NetBSD: adm1021.c,v 1.26 2021/01/28 14:35:11 thorpej Exp $ */
+/*	$NetBSD: adm1021.c,v 1.27 2021/01/30 01:22:06 thorpej Exp $ */
 /*	$OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $	*/
 /*
  * Copyright (c) 2005 Theo de Raadt
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -28,27 +28,27 @@
  *   no negative temps     X        X       X       X
  *   11-bit remote temp             X       X       X                  X
  *   no low limits                                       X             X
  *   therm (high) limits                    X       X                  X
+ *
  * Registers 0x00 to 0x0f have separate read/write addresses, but
  * registers 0x10 and above have the same read/write address.
  * The 11-bit (extended) temperature consists of a separate register with
  * 3 valid bits that are always added to the external temperature (even if
  * the temperature is negative).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.26 2021/01/28 14:35:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.27 2021/01/30 01:22:06 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/i2c/i2cvar.h>
 /* Registers */
 #define ADM1021_INT_TEMP	0x00	/* Internal temperature value */
 #define ADM1021_EXT_TEMP	0x01	/* External temperature value */
 #define ADM1021_STATUS		0x02	/* Status */
 #define ADM1021_CONFIG_READ	0x03	/* Read configuration */
 @@ -332,26 +332,27 @@ admtemp_setflags(struct admtemp_softc *s
 void
 admtemp_attach(device_t parent, device_t self, void *aux)
+{
 	struct admtemp_softc *sc = device_private(self);
 	struct i2c_attach_args *ia = aux;
 	uint8_t cmd, data, stat, comp, rev;
 	char name[ADMTEMP_NAMELEN];
 	char ename[64] = "external", iname[64] = "internal";
 	const char *desc;
 	sc->sc_tag = ia->ia_tag;
 	sc->sc_addr = ia->ia_addr;
 	sc->sc_prop = ia->ia_prop;
 	prop_object_retain(sc->sc_prop);
 	iic_acquire_bus(sc->sc_tag, 0);
 	cmd = ADM1021_CONFIG_READ;
 	if (admtemp_exec(sc, I2C_OP_READ_WITH_STOP, &cmd, &data) != 0) {
 		iic_release_bus(sc->sc_tag, 0);
 		aprint_error_dev(self, "cannot get control register\n");
 		return;
+	}
 	if (data & ADM1021_CONFIG_RUN) {
 		cmd = ADM1021_STATUS;
 		if (admtemp_exec(sc, I2C_OP_READ_WITH_STOP, &cmd, &stat)) {
 			iic_release_bus(sc->sc_tag, 0);
 			aprint_error_dev(self,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dbcool.c,v 1.59 2021/01/27 02:29:48 thorpej Exp $ */
+/*	$NetBSD: dbcool.c,v 1.60 2021/01/30 01:22:06 thorpej 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.59 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.60 2021/01/30 01:22:06 thorpej 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 */
 @@ -766,26 +766,27 @@ void
 dbcool_attach(device_t parent, device_t self, void *aux)
+{
 	struct dbcool_softc *sc = device_private(self);
 	struct i2c_attach_args *args = aux;
 	uint8_t ver;
 	sc->sc_dc.dc_addr = args->ia_addr;
 	sc->sc_dc.dc_tag = args->ia_tag;
 	sc->sc_dc.dc_chip = NULL;
 	sc->sc_dc.dc_readreg = dbcool_readreg;
 	sc->sc_dc.dc_writereg = dbcool_writereg;
 	sc->sc_dev = self;
 	sc->sc_prop = args->ia_prop;
 	prop_object_retain(sc->sc_prop);
 	if (dbcool_chip_ident(&sc->sc_dc) < 0 || sc->sc_dc.dc_chip == NULL)
 		panic("could not identify chip at addr %d", args->ia_addr);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	ver = sc->sc_dc.dc_readreg(&sc->sc_dc, DBCOOL_REVISION_REG);
 	if (sc->sc_dc.dc_chip->flags & DBCFLAG_4BIT_VER)
 	        if (sc->sc_dc.dc_chip->company == SMSC_COMPANYID)
+	        {
 		        aprint_normal_dev(self, "SMSC %s Controller "
 			    "(rev 0x%02x, stepping 0x%02x)\n",

 @@ -1,14 +1,14 @@
-/* $NetBSD: dstemp.c,v 1.9 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: dstemp.c,v 1.10 2021/01/30 01:22:06 thorpej Exp $ */
 /*-
  * Copyright (c) 2018 Michael Lorenz
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dstemp.c,v 1.9 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dstemp.c,v 1.10 2021/01/30 01:22:06 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/sysmon/sysmonvar.h>
 #define DSTEMP_CMD_START	0x51	/* command, no data */
 #define DSTEMP_CMD_POR		0x54	/* command, no data */
 @@ -99,26 +99,27 @@ dstemp_match(device_t parent, cfdata_t m
 static void
 dstemp_attach(device_t parent, device_t self, void *aux)
+{
 	struct dstemp_softc *sc = device_private(self);
 	struct i2c_attach_args *ia = aux;
 	char name[64] = "temperature";
 	const char *desc;
 	sc->sc_dev = self;
 	sc->sc_i2c = ia->ia_tag;
 	sc->sc_addr = ia->ia_addr;
 	sc->sc_prop = ia->ia_prop;
 	prop_object_retain(sc->sc_prop);
 	aprint_naive("\n");
 	aprint_normal(": DS1361\n");
 	dstemp_init(sc);
 	sc->sc_sme = sysmon_envsys_create();
 	sc->sc_sme->sme_name = device_xname(self);
 	sc->sc_sme->sme_cookie = sc;
 	sc->sc_sme->sme_refresh = dstemp_sensors_refresh;
 	sc->sc_sensor_temp.units = ENVSYS_STEMP;
 	sc->sc_sensor_temp.state = ENVSYS_SINVALID;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lm75.c,v 1.39 2021/01/27 02:29:48 thorpej Exp $	*/
+/*	$NetBSD: lm75.c,v 1.40 2021/01/30 01:22:06 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.39 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.40 2021/01/30 01:22:06 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/lm75reg.h>
 struct lmtemp_softc {
 @@ -178,26 +178,27 @@ lmtemp_attach(device_t parent, device_t
 				break;
 	} else {
 		if (strcmp(ia->ia_name, "ds1775") == 0) {
 			i = 1;	/* LMTYPE_DS75 */
 		} else {
 			/* XXX - add code when adding other direct matches! */
 			i = 0;
+		}
+	}
 	sc->sc_tag = ia->ia_tag;
 	sc->sc_address = ia->ia_addr;
 	sc->sc_prop = ia->ia_prop;
 	prop_object_retain(sc->sc_prop);
 	aprint_naive(": Temperature Sensor\n");
 	if (ia->ia_name) {
 		aprint_normal(": %s %s Temperature Sensor\n", ia->ia_name,
 			lmtemptbl[i].lmtemp_name);
 	} else {
 		aprint_normal(": %s Temperature Sensor\n",
 			lmtemptbl[i].lmtemp_name);
+	}
 	sc->sc_lmtemp_decode = lmtemptbl[i].lmtemp_decode;
 	sc->sc_lmtemp_encode = lmtemptbl[i].lmtemp_encode;