 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofw_subr.c,v 1.45 2021/01/24 16:45:41 thorpej Exp $	*/
+/*	$NetBSD: ofw_subr.c,v 1.46 2021/01/24 17:44:16 thorpej Exp $	*/
 /*
  * Copyright 1998
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -24,30 +24,31 @@
  * 3) This software is provided "AS-IS" and any express or implied
  *    warranties, including but not limited to, any implied warranties
  *    of merchantability, fitness for a particular purpose, or
  *    non-infringement are disclaimed. In no event shall DIGITAL be
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.45 2021/01/24 16:45:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.46 2021/01/24 17:44:16 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <dev/ofw/openfirm.h>
 #define	OFW_MAX_STACK_BUF_SIZE	256
 #define	OFW_PATH_BUF_SIZE	512
 /*
  * int of_decode_int(p)
+ *
  * This routine converts OFW encoded-int datums
  * into the integer format of the host machine.
+ *
 @@ -205,67 +206,93 @@ of_match_compatible(int phandle, const c
+ *
  * Return Value:
  *	0 if none of the strings are found in phandle's "compatibility"
  *	property, or a positive number based on the reverse index of the
  *	matching string in the phandle's "compatibility" property, plus 1.
+ *
  * Side Effects:
  *	None.
  */
 int
 of_match_compat_data(int phandle,
     const struct device_compatible_entry *compat_data)
+{
-	for (; compat_data->compat != NULL; compat_data++) {
+	char *prop, propbuf[OFW_MAX_STACK_BUF_SIZE];
-		const char *compat[] = { compat_data->compat, NULL };
+	int proplen, match = 0;
 		const int match = of_match_compatible(phandle, compat);
-		if (match)
+	proplen = OF_getproplen(phandle, "compatible");
-			return match;
+	if (proplen <= 0) {
 		return 0;
+	}
 	return 0;
 	prop = kmem_tmpbuf_alloc(proplen, propbuf, sizeof(propbuf), KM_SLEEP);
 	if (OF_getprop(phandle, "compatible", prop, proplen) != proplen) {
 		goto out;
+	}
 	match = device_compatible_match_strlist(prop, proplen, compat_data);
  out:
 	kmem_tmpbuf_free(prop, proplen, propbuf);
 	return match;
+}
 /*
  * const struct device_compatible_entry *of_search_compatible(phandle,
  *							      compat_data)
+ *
  * This routine searches an array of compat_data structures for a
  * matching "compatible" entry matching the supplied OFW node.
+ *
  * Arguments:
  *	phandle		OFW phandle of device to be checked for
  *			compatibility.
  *	compat_data	Array of possible compat entry strings and
  *			associated metadata. The last entry in the
  *			list should have a "compat" of NULL to terminate
  *			the list.
+ *
  * Return Value:
  *	The first matching compat_data entry in the array. If no matches
- *	are found, the NULL is returned.
+ *	are found, NULL is returned.
+ *
  * Side Effects:
  *	None.
  */
 const struct device_compatible_entry *
 of_search_compatible(int phandle,
     const struct device_compatible_entry *compat_data)
+{
-	for (; compat_data->compat != NULL; compat_data++) {
+	char *prop, propbuf[OFW_MAX_STACK_BUF_SIZE];
-		const char *compat[] = { compat_data->compat, NULL };
+	const struct device_compatible_entry *match = NULL;
-		if (of_match_compatible(phandle, compat))
+	int proplen;
 			return compat_data;
 	proplen = OF_getproplen(phandle, "compatible");
 	if (proplen <= 0) {
 		return 0;
+	}
 	return NULL;
 	prop = kmem_tmpbuf_alloc(proplen, propbuf, sizeof(propbuf), KM_SLEEP);
 	if (OF_getprop(phandle, "compatible", prop, proplen) != proplen) {
 		goto out;
+	}
 	match = device_compatible_lookup_strlist(prop, proplen, compat_data);
  out:
 	kmem_tmpbuf_free(prop, proplen, propbuf);
 	return match;
+}
 /*
  * int of_packagename(phandle, buf, bufsize)
+ *
  * This routine places the last component of an OFW node's name
  * into a user-provided buffer.
+ *
  * It can be used during autoconfiguration to make printing of
  * device names more informative.
+ *
  * Arguments:
  *	phandle		OFW phandle of device whose name name is