acpi: clean up some inconsistent style in the hid matching arrays

ok millert, kettenis, jcs, phessler, deraadt, mpi

8 files changed, 30 insertions, 16 deletions

diff --git a/sys/dev/acpi/acpiac.c b/sys/dev/acpi/acpiac.c
index 0e502a7111d..c895eb71348 100644
--- a/sys/dev/acpi/acpiac.c
+++ b/sys/dev/acpi/acpiac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiac.c,v 1.30 2015/07/17 20:15:52 jcs Exp $ */
+/* $OpenBSD: acpiac.c,v 1.31 2018/07/01 19:40:49 mlarkin Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -46,7 +46,10 @@ struct cfdriver acpiac_cd = {
 	NULL, "acpiac", DV_DULL
 };
 
-const char *acpiac_hids[] = { ACPI_DEV_AC, 0 };
+const char *acpiac_hids[] = {
+	ACPI_DEV_AC,
+	NULL
+};
 
 int
 acpiac_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/acpi/acpiasus.c b/sys/dev/acpi/acpiasus.c
index b853aa50a60..d41ce4f6bea 100644
--- a/sys/dev/acpi/acpiasus.c
+++ b/sys/dev/acpi/acpiasus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiasus.c,v 1.18 2017/02/25 20:09:20 jcs Exp $ */
+/* $OpenBSD: acpiasus.c,v 1.19 2018/07/01 19:40:49 mlarkin Exp $ */
 /* $NetBSD: asus_acpi.c,v 1.2.2.2 2008/04/03 12:42:37 mjf Exp $ */
 /*
  * Copyright (c) 2007, 2008 Jared D. McNeill <jmcneill@invisible.ca>
@@ -97,7 +97,7 @@ struct cfdriver acpiasus_cd = {
 
 const char *acpiasus_hids[] = {
 	"ASUS010",
-	0
+	NULL
 };
 
 int
diff --git a/sys/dev/acpi/acpibat.c b/sys/dev/acpi/acpibat.c
index 82f6fc61d9c..6c669f05235 100644
--- a/sys/dev/acpi/acpibat.c
+++ b/sys/dev/acpi/acpibat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpibat.c,v 1.66 2017/09/04 13:47:56 jcs Exp $ */
+/* $OpenBSD: acpibat.c,v 1.67 2018/07/01 19:40:49 mlarkin Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -40,7 +40,10 @@ struct cfdriver acpibat_cd = {
 	NULL, "acpibat", DV_DULL
 };
 
-const char *acpibat_hids[] = { ACPI_DEV_CMB, 0 };
+const char *acpibat_hids[] = {
+	ACPI_DEV_CMB,
+	NULL
+};
 
 void	acpibat_monitor(struct acpibat_softc *);
 void	acpibat_refresh(void *);
diff --git a/sys/dev/acpi/acpibtn.c b/sys/dev/acpi/acpibtn.c
index 8f9e2c20749..8036d274442 100644
--- a/sys/dev/acpi/acpibtn.c
+++ b/sys/dev/acpi/acpibtn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpibtn.c,v 1.44 2017/03/02 10:38:10 natano Exp $ */
+/* $OpenBSD: acpibtn.c,v 1.45 2018/07/01 19:40:49 mlarkin Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -74,7 +74,12 @@ struct cfdriver acpibtn_cd = {
 	NULL, "acpibtn", DV_DULL
 };
 
-const char *acpibtn_hids[] = { ACPI_DEV_LD, ACPI_DEV_PBD, ACPI_DEV_SBD, 0 };
+const char *acpibtn_hids[] = {
+	ACPI_DEV_LD,
+	ACPI_DEV_PBD,
+	ACPI_DEV_SBD,
+	NULL
+};
 
 /*
  * acpibtn_numopenlids
diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c
index d9f2f54e480..f2eb098aa85 100644
--- a/sys/dev/acpi/acpiec.c
+++ b/sys/dev/acpi/acpiec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiec.c,v 1.58 2018/06/29 17:39:18 kettenis Exp $ */
+/* $OpenBSD: acpiec.c,v 1.59 2018/07/01 19:40:49 mlarkin Exp $ */
 /*
  * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
  *
@@ -87,7 +87,10 @@ struct cfdriver acpiec_cd = {
 	NULL, "acpiec", DV_DULL
 };
 
-const char *acpiec_hids[] = { ACPI_DEV_ECD, 0 };
+const char *acpiec_hids[] = {
+	ACPI_DEV_ECD,
+	NULL
+};
 
 void
 acpiec_wait(struct acpiec_softc *sc, uint8_t mask, uint8_t val)
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c
index 573a026d6ab..826030bad6a 100644
--- a/sys/dev/acpi/acpithinkpad.c
+++ b/sys/dev/acpi/acpithinkpad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpithinkpad.c,v 1.60 2018/06/29 17:39:18 kettenis Exp $	*/
+/*	$OpenBSD: acpithinkpad.c,v 1.61 2018/07/01 19:40:49 mlarkin Exp $	*/
 /*
  * Copyright (c) 2008 joshua stein <jcs@openbsd.org>
  *
@@ -195,7 +195,7 @@ const char *acpithinkpad_hids[] = {
 	"IBM0068",
 	"LEN0068",
 	"LEN0268",
-	0
+	NULL
 };
 
 int
diff --git a/sys/dev/acpi/acpitoshiba.c b/sys/dev/acpi/acpitoshiba.c
index d5646994ff0..d070d98bcdc 100644
--- a/sys/dev/acpi/acpitoshiba.c
+++ b/sys/dev/acpi/acpitoshiba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitoshiba.c,v 1.10 2018/06/29 17:39:18 kettenis Exp $ */
+/* $OpenBSD: acpitoshiba.c,v 1.11 2018/07/01 19:40:49 mlarkin Exp $ */
 /*-
  * Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org>
  * All rights reserved.
@@ -124,7 +124,7 @@ const char *acpitoshiba_hids[] = {
 	"TOS6200",	/* Libretto */
 	"TOS6207",	/* Dynabook */
 	"TOS6208",	/* SPA40 */
-	0
+	NULL
 };
 
 int
diff --git a/sys/dev/acpi/tpm.c b/sys/dev/acpi/tpm.c
index 5bf9ef65f90..b44f07f6308 100644
--- a/sys/dev/acpi/tpm.c
+++ b/sys/dev/acpi/tpm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tpm.c,v 1.2 2016/10/25 06:48:58 pirofti Exp $ */
+/* $OpenBSD: tpm.c,v 1.3 2018/07/01 19:40:49 mlarkin Exp $ */
 
 /*
  * Minimal interface to Trusted Platform Module chips implementing the
@@ -194,7 +194,7 @@ const char *tpm_hids[] = {
 	"BCM0102",
 	"NSC1200",
 	"ICO0102",
-	0
+	NULL
 };
 
 int