 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_acad.c,v 1.51 2015/04/23 23:23:00 pgoyette Exp $	*/
+/*	$NetBSD: acpi_acad.c,v 1.52 2021/01/29 15:20:13 thorpej Exp $	*/
 /*
  * Copyright 2001 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
 @@ -30,80 +30,77 @@
  * 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.
  */
 /*
  * ACPI AC Adapter driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.51 2015/04/23 23:23:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.52 2021/01/29 15:20:13 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #define _COMPONENT		 ACPI_ACAD_COMPONENT
 ACPI_MODULE_NAME		 ("acpi_acad")
 #define ACPI_NOTIFY_ACAD	 0x80
 #define ACPI_NOTIFY_ACAD_2	 0x81 /* XXX. */
 struct acpiacad_softc {
 	struct acpi_devnode	*sc_node;
 	struct sysmon_envsys	*sc_sme;
 	struct sysmon_pswitch	 sc_smpsw;
 	envsys_data_t		 sc_sensor;
 	int			 sc_status;
 };
-static const char * const acad_hid[] = {
+static const struct device_compatible_entry compat_data[] = {
-	"ACPI0003",
+	{ .compat = "ACPI0003" },
-	NULL
+	DEVICE_COMPAT_EOL
 };
 static int	acpiacad_match(device_t, cfdata_t, void *);
 static void	acpiacad_attach(device_t, device_t, void *);
 static int	acpiacad_detach(device_t, int);
 static bool	acpiacad_resume(device_t, const pmf_qual_t *);
 static void	acpiacad_get_status(void *);
 static void	acpiacad_notify_handler(ACPI_HANDLE, uint32_t, void *);
 static void	acpiacad_init_envsys(device_t);
 CFATTACH_DECL_NEW(acpiacad, sizeof(struct acpiacad_softc),
     acpiacad_match, acpiacad_attach, acpiacad_detach, NULL);
 /*
  * acpiacad_match:
+ *
  *	Autoconfiguration `match' routine.
  */
 static int
 acpiacad_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct acpi_attach_args *aa = aux;
-	if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
+	return acpi_compatible_match(aa, compat_data);
 		return 0;
 	return acpi_match_hid(aa->aa_node->ad_devinfo, acad_hid);
+}
 /*
  * acpiacad_attach:
+ *
  *	Autoconfiguration `attach' routine.
  */
 static void
 acpiacad_attach(device_t parent, device_t self, void *aux)
+{
 	struct acpiacad_softc *sc = device_private(self);
 	struct acpi_attach_args *aa = aux;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_bat.c,v 1.116 2018/08/10 17:11:56 riastradh Exp $	*/
+/*	$NetBSD: acpi_bat.c,v 1.117 2021/01/29 15:20:13 thorpej Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum of By Noon Software, 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.
 @@ -65,27 +65,27 @@
 /*
  * ACPI Battery Driver.
+ *
  * ACPI defines two different battery device interfaces: "Control
  * Method" batteries, in which AML methods are defined in order to get
  * battery status and set battery alarm thresholds, and a "Smart
  * Battery" device, which is an SMbus device accessed through the ACPI
  * Embedded Controller device.
+ *
  * This driver is for the "Control Method"-style battery only.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.116 2018/08/10 17:11:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.117 2021/01/29 15:20:13 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/condvar.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 @@ -149,29 +149,29 @@ struct acpibat_softc {
 	struct acpi_devnode	*sc_node;
 	struct sysmon_envsys	*sc_sme;
 	struct timeval		 sc_last;
 	envsys_data_t		*sc_sensor;
 	kmutex_t		 sc_mutex;
 	kcondvar_t		 sc_condvar;
 	int32_t			 sc_dcapacity;
 	int32_t			 sc_dvoltage;
 	int32_t			 sc_lcapacity;
 	int32_t			 sc_wcapacity;
 	int                      sc_present;
 };
-static const char * const bat_hid[] = {
+static const struct device_compatible_entry compat_data[] = {
-	"PNP0C0A",
+	{ .compat = "PNP0C0A" },
-	NULL
+	DEVICE_COMPAT_EOL
 };
 #define ACPIBAT_PWRUNIT_MA	0x00000001  /* mA not mW */
 #define ACPIBAT_ST_DISCHARGING	0x00000001  /* battery is discharging */
 #define ACPIBAT_ST_CHARGING	0x00000002  /* battery is charging */
 #define ACPIBAT_ST_CRITICAL	0x00000004  /* battery is critical */
 /*
  * A value used when _BST or _BIF is temporarily unknown.
  */
 #define ACPIBAT_VAL_UNKNOWN	0xFFFFFFFF
 #define ACPIBAT_VAL_ISVALID(x)						      \
 @@ -197,30 +197,27 @@ static void	    acpibat_get_limits(struc
 CFATTACH_DECL_NEW(acpibat, sizeof(struct acpibat_softc),
     acpibat_match, acpibat_attach, acpibat_detach, NULL);
 /*
  * acpibat_match:
+ *
  *	Autoconfiguration `match' routine.
  */
 static int
 acpibat_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct acpi_attach_args *aa = aux;
-	if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
+	return acpi_compatible_match(aa, compat_data);
 		return 0;
 	return acpi_match_hid(aa->aa_node->ad_devinfo, bat_hid);
+}
 /*
  * acpibat_attach:
+ *
  *	Autoconfiguration `attach' routine.
  */
 static void
 acpibat_attach(device_t parent, device_t self, void *aux)
+{
 	struct acpibat_softc *sc = device_private(self);
 	struct acpi_attach_args *aa = aux;
 	ACPI_HANDLE tmp;