Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x86/pci/amdsmn.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/pci/amdsmn.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.10
retrieving revision 1.10.4.5
diff -u -p -r1.10 -r1.10.4.5
--- src/sys/arch/x86/pci/amdsmn.c	2020/04/25 15:26:18	1.10
+++ src/sys/arch/x86/pci/amdsmn.c	2021/04/04 22:01:21	1.10.4.5
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdsmn.c,v 1.10 2020/04/25 15:26:18 bouyer Exp $	*/
+/*	$NetBSD: amdsmn.c,v 1.10.4.5 2021/04/04 22:01:21 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2017, 2019 Conrad Meyer <cem@FreeBSD.org>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.10 2020/04/25 15:26:18 bouyer Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.10.4.5 2021/04/04 22:01:21 thorpej Exp $ ");
 
 /*
  * Driver for the AMD Family 15h (model 60+) and 17h CPU
@@ -123,7 +123,9 @@ static int
 amdsmn_misc_search(device_t parent, cfdata_t cf, const int *locs, void *aux)
 {
 	if (config_match(parent, cf, aux))
-		config_attach_loc(parent, cf, locs, aux, NULL);
+		config_attach(parent, cf, aux, NULL,
+		    CFARG_LOCATORS, locs,
+		    CFARG_EOL);
 
 	return 0;
 }
@@ -133,7 +135,6 @@ amdsmn_attach(device_t parent, device_t 
 {
 	struct amdsmn_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
-	int flags = 0;
 	size_t i;
 
 	mutex_init(&sc->smn_lock, MUTEX_DEFAULT, IPL_NONE);
@@ -149,15 +150,17 @@ amdsmn_attach(device_t parent, device_t 
 
 	// aprint_normal(": AMD Family 17h System Management Network\n");
 	aprint_normal(": AMD System Management Network\n");
-	amdsmn_rescan(self, "amdsmnbus", &flags);
+	amdsmn_rescan(self, NULL, NULL);
 }
 
 static int
-amdsmn_rescan(device_t self, const char *ifattr, const int *flags)
+amdsmn_rescan(device_t self, const char *ifattr, const int *locators)
 {
 	struct amdsmn_softc *sc = device_private(self);
 
-	config_search_loc(amdsmn_misc_search, self, ifattr, NULL, &sc->pa);
+	config_search(self, &sc->pa,
+	    CFARG_SEARCH, amdsmn_misc_search,
+	    CFARG_EOL);
 
 	return 0;
 }