 @@ -1,14 +1,14 @@
-/*	$NetBSD: mii_verbose.c,v 1.6 2019/03/25 09:46:24 msaitoh Exp $ */
+/*	$NetBSD: mii_verbose.c,v 1.7 2021/06/05 22:21:15 pgoyette Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Frank van der Linden.
+ *
  * 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
 @@ -45,52 +45,54 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_verbose.c,v 1.6 2019/03/25 09:46:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_verbose.c,v 1.7 2021/06/05 22:21:15 pgoyette Exp $");
 #include <sys/module.h>
 #include <dev/mii/miidevs.h>
 #include <dev/mii/miidevs_data.h>
 #include <dev/mii/mii_verbose.h>
 const char * mii_get_descr_real(int, int);
 MODULE(MODULE_CLASS_MISC, miiverbose, NULL);
 static int
 miiverbose_modcmd(modcmd_t cmd, void *arg)
+{
 	static const char *(*saved_mii_get_descr)(int, int);
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		saved_mii_get_descr = mii_get_descr;
 		mii_get_descr = mii_get_descr_real;
 		mii_verbose_loaded = 1;
 		return 0;
 	case MODULE_CMD_FINI:
 		mii_get_descr = saved_mii_get_descr;
 		mii_verbose_loaded = 0;
 		return 0;
 	casce MODULE_CMD_AUTOUNLOAD:
 		return EBUSY;
 	default:
 		return ENOTTY;
+	}
+}
 const char *
 mii_get_descr_real(int oui, int model)
+{
 	int i;
 	for (i = 0; mii_knowndevs[i].descr != NULL; i++)
 		if (mii_knowndevs[i].oui == oui &&
 		    mii_knowndevs[i].model == model)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsipi_verbose.c,v 1.34 2018/09/16 23:20:18 mrg Exp $	*/
+/*	$NetBSD: scsipi_verbose.c,v 1.35 2021/06/05 22:21:15 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.34 2018/09/16 23:20:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.35 2021/06/05 22:21:15 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #include <sys/module.h>
 #else
 #include <stdio.h>
 #endif
 #include <dev/scsipi/scsipi_all.h>
 @@ -843,26 +843,28 @@ scsiverbose_modcmd(modcmd_t cmd, void *a
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		saved_print_sense = scsipi_print_sense;
 		saved_print_sense_data = scsipi_print_sense_data;
 		scsipi_print_sense = scsipi_print_sense_real;
 		scsipi_print_sense_data = scsipi_print_sense_data_real;
 		scsi_verbose_loaded = 1;
 		return 0;
 	case MODULE_CMD_FINI:
 		scsipi_print_sense = saved_print_sense;
 		scsipi_print_sense_data = saved_print_sense_data;
 		scsi_verbose_loaded = 0;
 		return 0;
 	case MODULE_CMD_AUTOUNLOAD:
 		return EBUSY;
 	default:
 		return ENOTTY;
+	}
+}
 #else
 int	(*scsipi_print_sense)(struct scsipi_xfer *, int) =
 		scsipi_print_sense_real;
 void	(*scsipi_print_sense_data)(struct scsi_sense_data *, int) =
 		scsipi_print_sense_data_real;
 #endif
 static void
 asc2ascii(u_char asc, u_char ascq, char *result, size_t l)