 @@ -1,14 +1,14 @@
-/*	$NetBSD: audio.c,v 1.75 2020/05/29 03:09:14 isaki Exp $	*/
+/*	$NetBSD: audio.c,v 1.76 2020/08/23 04:07:23 isaki 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.75 2020/05/29 03:09:14 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.76 2020/08/23 04:07:23 isaki 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>
 @@ -891,33 +891,35 @@ audioattach(device_t parent, device_t se
 	has_fulldup  = (sc->sc_props & AUDIO_PROP_FULLDUPLEX);
 #ifdef DIAGNOSTIC
 	if (hw_if->query_format == NULL ||
 	    hw_if->set_format == NULL ||
 	    hw_if->getdev == NULL ||
 	    hw_if->set_port == NULL ||
 	    hw_if->get_port == NULL ||
 	    hw_if->query_devinfo == NULL) {
 		aprint_error(": missing mandatory method\n");
 		return;
+	}
 	if (has_playback) {
-		if ((hw_if->start_output == NULL && hw_if->trigger_output == NULL) ||
+		if ((hw_if->start_output == NULL &&
 		     hw_if->trigger_output == NULL) ||
 		    hw_if->halt_output == NULL) {
 			aprint_error(": missing playback method\n");
+		}
+	}
 	if (has_capture) {
-		if ((hw_if->start_input == NULL && hw_if->trigger_input == NULL) ||
+		if ((hw_if->start_input == NULL &&
 		     hw_if->trigger_input == NULL) ||
 		    hw_if->halt_input == NULL) {
 			aprint_error(": missing capture method\n");
+		}
+	}
 #endif
 	sc->hw_if = hw_if;
 	sc->hw_hdl = hdlp;
 	sc->hw_dev = parent;
 	sc->sc_exlock = 1;
 	sc->sc_blk_ms = AUDIO_BLK_MS;
 	SLIST_INIT(&sc->sc_files);
 @@ -6119,27 +6121,27 @@ audio_softintr_wr(void *cookie)
+}
 /*
  * Check (and convert) the format *p came from userland.
  * If successful, it writes back the converted format to *p if necessary
  * and returns 0.  Otherwise returns errno (*p may change even this case).
  */
 static int
 audio_check_params(audio_format2_t *p)
+{
 	/*
 	 * Convert obsolete AUDIO_ENCODING_PCM encodings.
+	 *
 	 * AUDIO_ENCODING_PCM16 == AUDIO_ENCODING_LINEAR
 	 * So, it's always signed, as in SunOS.
+	 *
 	 * AUDIO_ENCODING_PCM8 == AUDIO_ENCODING_LINEAR8
 	 * So, it's always unsigned, as in SunOS.
 	 */
 	if (p->encoding == AUDIO_ENCODING_PCM16) {
 		p->encoding = AUDIO_ENCODING_SLINEAR;
 	} else if (p->encoding == AUDIO_ENCODING_PCM8) {
 		if (p->precision == 8)
 			p->encoding = AUDIO_ENCODING_ULINEAR;
 		else
 			return EINVAL;
 @@ -6422,27 +6424,27 @@ audio_hw_probe(struct audio_softc *sc, a
 		return ENXIO;
+	}
 	DPRINTF(1, "%s selected: %s,%d/%d,%dch,%dHz\n", __func__,
 	    audio_encoding_name(cand->encoding),
 	    cand->precision, cand->stride, cand->channels, cand->sample_rate);
 	return 0;
+}
 /*
  * Validate fmt with query_format.
  * If fmt is included in the result of query_format, returns 0.
  * Otherwise returns EINVAL.
  * Must be called without sc_lock held.
  */
 static int
 audio_hw_validate_format(struct audio_softc *sc, int mode,
 	const audio_format2_t *fmt)
+{
 	audio_format_query_t query;
 	struct audio_format *q;
 	int index;
 	int error;
 	int j;
 	for (index = 0; ; index++) {
 		query.index = index;
 		mutex_enter(sc->sc_lock);