Sun Mar 28 19:55:37 2021 UTC ()

audio only has one interface attribute, so no need to be explcit about it.
audio also doesn't have locators, so don't pass any to config_search().


(thorpej)

diff -r1.91.2.3 -r1.91.2.4 src/sys/dev/audio/audio.c

--- src/sys/dev/audio/audio.c 2021/03/21 21:09:09	1.91.2.3
+++ src/sys/dev/audio/audio.c 2021/03/28 19:55:37	1.91.2.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: audio.c,v 1.91.2.3 2021/03/21 21:09:09 thorpej Exp $	*/
+/*	$NetBSD: audio.c,v 1.91.2.4 2021/03/28 19:55:37 thorpej Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -128,27 +128,27 @@
  *	get_locks 		-	-	Called at attach time
+ *
  * In addition, there is an additional lock.
+ *
  * - track->lock.  This is an atomic variable and is similar to the
  *   "interrupt lock".  This is one for each track.  If any thread context
  *   (and software interrupt context) and hardware interrupt context who
  *   want to access some variables on this track, they must acquire this
  *   lock before.  It protects track's consistency between hardware
  *   interrupt context and others.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.91.2.3 2021/03/21 21:09:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.91.2.4 2021/03/28 19:55:37 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "audio.h"
 #include "midi.h"
 #endif
 #if NAUDIO > 0
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/audioio.h>
 #include <sys/conf.h>
 @@ -1101,27 +1101,27 @@ audioattach(device_t parent, device_t se
 		aprint_error_dev(self, "couldn't add volume up handler\n");
 	if (!pmf_event_register(self, PMFE_AUDIO_VOLUME_TOGGLE,
 	    audio_volume_toggle, true))
 		aprint_error_dev(self, "couldn't add volume toggle handler\n");
 #ifdef AUDIO_PM_IDLE
 	callout_schedule(&sc->sc_idle_counter, audio_idle_timeout * hz);
 #endif
 #if defined(AUDIO_DEBUG)
 	audio_mlog_init();
 #endif
-	audiorescan(self, "audio", NULL);
+	audiorescan(self, NULL, NULL);
 	sc->sc_exlock = 0;
 	return;
 bad:
 	/* Clearing hw_if means that device is attached but disabled. */
 	sc->hw_if = NULL;
 	sc->sc_exlock = 0;
 	aprint_error_dev(sc->sc_dev, "disabled\n");
 	return;
+}
 /*
  * Initialize hardware mixer.
 @@ -1406,28 +1406,26 @@ audiosearch(device_t parent, cfdata_t cf
 	if (config_match(parent, cf, aux))
 		config_attach_loc(parent, cf, locs, aux, NULL);
 	return 0;
+}
 static int
 audiorescan(device_t self, const char *ifattr, const int *locators)
+{
 	struct audio_softc *sc = device_private(self);
 	config_search(sc->sc_dev, NULL,
 	    CFARG_SUBMATCH, audiosearch,
 	    CFARG_IATTR, ifattr,
 	    CFARG_LOCATORS, locators,
 	    CFARG_EOL);
 	return 0;
+}
 /*
  * Called from hardware driver.  This is where the MI audio driver gets
  * probed/attached to the hardware driver.
  */
 device_t
 audio_attach_mi(const struct audio_hw_if *ahwp, void *hdlp, device_t dev)
+{
 	struct audio_attach_args arg;