 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofw_subr.c,v 1.47 2021/01/24 19:38:37 thorpej Exp $	*/
+/*	$NetBSD: ofw_subr.c,v 1.48 2021/01/24 21:48:38 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,33 +24,32 @@
  * 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.47 2021/01/24 19:38:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.48 2021/01/24 21:48:38 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.
+ *
  * It is primarily used to convert integer properties
  * returned by the OF_getprop routine.
 @@ -283,49 +282,49 @@ of_search_compatible(int phandle,
  *	If the leaf node name was successfully extracted, 'buf' is
  *	filled in with at most 'bufsize' bytes of the leaf node
  *	name.  If the leaf node was not successfully extracted, a
  *	somewhat meaningful string is placed in the buffer.  In
  *	either case, the contents of 'buf' will be NUL-terminated.
  */
 int
 of_packagename(int phandle, char *buf, int bufsize)
+{
 	char *pbuf;
 	const char *lastslash;
 	int l, rv;
-	pbuf = malloc(OFW_PATH_BUF_SIZE, M_TEMP, M_WAITOK);
+	pbuf = kmem_alloc(OFW_PATH_BUF_SIZE, KM_SLEEP);
 	l = OF_package_to_path(phandle, pbuf, OFW_PATH_BUF_SIZE);
 	/* check that we could get the name, and that it's not too long. */
 	if (l < 0 ||
 	    (l == OFW_PATH_BUF_SIZE && pbuf[OFW_PATH_BUF_SIZE - 1] != '\0')) {
 		if (bufsize >= 25)
 			snprintf(buf, bufsize, "??? (phandle 0x%x)", phandle);
 		else if (bufsize >= 4)
 			strlcpy(buf, "???", bufsize);
 		else
 			panic("of_packagename: bufsize = %d is silly",
 			    bufsize);
 		rv = -1;
 	} else {
 		pbuf[l] = '\0';
 		lastslash = strrchr(pbuf, '/');
 		strlcpy(buf, (lastslash == NULL) ? pbuf : (lastslash + 1),
 		    bufsize);
 		rv = 0;
+	}
-	free(pbuf, M_TEMP);
+	kmem_free(pbuf, OFW_PATH_BUF_SIZE);
 	return (rv);
+}
 /*
  * Find the first child of a given node that matches name. Does not recurse.
  */
 int
 of_find_firstchild_byname(int node, const char *name)
+{
 	char namex[32];
 	int nn;
 	for (nn = OF_child(node); nn; nn = OF_peer(nn)) {