 @@ -1,14 +1,14 @@
-/*	$NetBSD: deq.c,v 1.19 2021/01/25 14:20:39 thorpej Exp $	*/
+/*	$NetBSD: deq.c,v 1.20 2021/01/27 02:17:27 thorpej Exp $	*/
 /*-
  * Copyright (C) 2005 Michael Lorenz
+ *
  * 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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -22,53 +22,53 @@
  * 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.
  */
 /*
  * a dummy device to attach to OF's deq node marking the TAS3004 audio mixer /
  * equalizer chip, needed by snapper
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.19 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.20 2021/01/27 02:17:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/i2c/i2cvar.h>
 #include <machine/autoconf.h>
 #include <macppc/dev/deqvar.h>
 static void deq_attach(device_t, device_t, void *);
 static int deq_match(device_t, struct cfdata *, void *);
 CFATTACH_DECL_NEW(deq, sizeof(struct deq_softc),
     deq_match, deq_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "deq" },
 	{ .compat = "tas3004" },
 	{ .compat = "pcm3052" },
 	{ .compat = "cs8416" },
 	{ .compat = "codec" },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 int
 deq_match(device_t parent, struct cfdata *cf, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 	int match_result;
 	if (iic_use_direct_match(ia, cf, compat_data, &match_result))
 		return match_result;
 	/* This driver is direct-config only. */

 @@ -1,14 +1,14 @@
-/* $NetBSD: lmu.c,v 1.7 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: lmu.c,v 1.8 2021/01/27 02:17:28 thorpej Exp $ */
 /*-
  * Copyright (c) 2020 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * ambient light controller found in PowerBook5,6
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lmu.c,v 1.7 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lmu.c,v 1.8 2021/01/27 02:17:28 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/time.h>
 #include <sys/callout.h>
 #include <sys/sysctl.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/sysmon/sysmonvar.h>
 @@ -73,27 +73,27 @@ static void	lmu_attach(device_t, device_
 static void	lmu_sensors_refresh(struct sysmon_envsys *, envsys_data_t *);
 static void	lmu_set_brightness(struct lmu_softc *, int);
 static int	lmu_get_brightness(struct lmu_softc *, int);
 static void	lmu_adjust(void *);
 static int 	lmu_sysctl(SYSCTLFN_ARGS);
 static int 	lmu_sysctl_thresh(SYSCTLFN_ARGS);
 CFATTACH_DECL_NEW(lmu, sizeof(struct lmu_softc),
     lmu_match, lmu_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "lmu-micro" },
 	{ .compat = "lmu-controller" },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 /* time between polling the light sensors */
 #define LMU_POLL	(hz * 2)
 /* time between updates to keyboard brightness */
 #define LMU_FADE	(hz / 16)
 static void
 lmu_lid_open(device_t dev)
+{
 	struct lmu_softc * const sc = device_private(dev);
 	sc->sc_lid_state = true;

 @@ -1,14 +1,14 @@
- /* $NetBSD: psoc.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $ */
+ /* $NetBSD: psoc.c,v 1.6 2021/01/27 02:17:28 thorpej Exp $ */
 /*-
  * Copyright (c) 2019 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.
 @@ -32,27 +32,27 @@
  * register values from OF:
  * fan1 - 0x20 ( status ), 0x31 ( data )
  * fan2 - 0x26 ( status ), 0x45 ( data )
  * fan status byte 0:
  * 0x5* - fan is running, 0x6* - fan stopped
  * byte 1: unknown, 0x80 seems always set, lower bits seem to fluctuate
  * byte 2: lower 6 bit seem to indicate speed
  * fan speed may be lower 6 bit of byte 2 and lower 6 of byte 1
  * temperature sensors start at 6, two bytes each, first appears to be
  * the temperature in degrees Celsius
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psoc.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psoc.c,v 1.6 2021/01/27 02:17:28 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/time.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/sysmon/sysmonvar.h>
 @@ -72,27 +72,27 @@ struct psoc_softc {
 static int	psoc_match(device_t, cfdata_t, void *);
 static void	psoc_attach(device_t, device_t, void *);
 static void	psoc_sensors_refresh(struct sysmon_envsys *, envsys_data_t *);
 static void	psoc_dump(struct psoc_softc *);
 CFATTACH_DECL_NEW(psoc, sizeof(struct psoc_softc),
     psoc_match, psoc_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "Psoc" },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 static int
 psoc_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 	int match_result;
 	if (iic_use_direct_match(ia, match, compat_data, &match_result))
 		return match_result;
 	return 0;
+}

 @@ -98,27 +98,27 @@ static int smusat_match(device_t, struct
 static void smusat_attach(device_t, device_t, void *);
 static void smusat_setup_sme(struct smusat_softc *);
 static void smusat_sme_refresh(struct sysmon_envsys *, envsys_data_t *);
 static int smusat_sensors_update(struct smusat_softc *);
 static int smusat_sensor_read(struct smusat_sensor *, int *);
 static int smusat_sysctl_sensor_value(SYSCTLFN_ARGS);
 CFATTACH_DECL_NEW(smusat, sizeof(struct smusat_softc),
     smusat_match, smusat_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "sat" },
 	{ .compat = "smu-sat" },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 static int
 smusat_match(device_t parent, struct cfdata *cf, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 	int match_result;
 	if (iic_use_direct_match(ia, cf, compat_data, &match_result))
 		return match_result;
 	if (ia->ia_addr == 0x58)
 		return I2C_MATCH_ADDRESS_ONLY;