 @@ -1,14 +1,14 @@
-/*	$NetBSD: mlx_pci.c,v 1.27 2018/12/09 11:14:02 jdolecek Exp $	*/
+/*	$NetBSD: mlx_pci.c,v 1.27.14.1 2021/03/28 20:38:04 thorpej Exp $	*/
 /*-
  * Copyright (c) 2001 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.
 @@ -52,27 +52,27 @@
  * 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.
+ *
  * from FreeBSD: mlx_pci.c,v 1.4.2.4 2000/10/28 10:48:09 msmith Exp
  */
 /*
  * PCI front-end for the mlx(4) driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.27 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.27.14.1 2021/03/28 20:38:04 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/callout.h>
 #include <sys/module.h>
 #include <machine/endian.h>
 #include <sys/bus.h>
 #include <dev/ic/mlxreg.h>
 @@ -135,27 +135,27 @@ static struct mlx_pci_ident {
 x0000,
 ,
 	},
+	{
 		PCI_VENDOR_DEC,
 		PCI_PRODUCT_DEC_SWXCR,
 		PCI_VENDOR_MYLEX,
 		PCI_PRODUCT_MYLEX_RAID_V5,
 ,
 	},
 };
 static int
-mlx_pci_rescan(device_t self, const char *attr, const int *flag)
+mlx_pci_rescan(device_t self, const char *ifattr, const int *locs)
+{
 	return mlx_configure(device_private(self), 1);
+}
 CFATTACH_DECL3_NEW(mlx_pci, sizeof(struct mlx_softc),
     mlx_pci_match, mlx_pci_attach, NULL, NULL, mlx_pci_rescan, NULL, 0);
 /*
  * Try to find a `mlx_pci_ident' entry corresponding to this board.
  */
 static const struct mlx_pci_ident *
 mlx_pci_findmpi(struct pci_attach_args *pa)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: twe.c,v 1.108.10.2 2021/03/22 16:23:46 thorpej Exp $	*/
+/*	$NetBSD: twe.c,v 1.108.10.3 2021/03/28 20:38:04 thorpej Exp $	*/
 /*-
  * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran; and by Jason R. Thorpe of Wasabi Systems, Inc.
+ *
  * 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.
 @@ -53,27 +53,27 @@
  * 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.
+ *
  * from FreeBSD: twe.c,v 1.1 2000/05/24 23:35:23 msmith Exp
  */
 /*
  * Driver for the 3ware Escalade family of RAID controllers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.108.10.2 2021/03/22 16:23:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.108.10.3 2021/03/28 20:38:04 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/endian.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/sysctl.h>
 @@ -441,27 +441,27 @@ twe_attach(device_t parent, device_t sel
 	rv = twe_reset(sc);
 	splx(s);
 	if (rv) {
 		aprint_error_dev(self, "reset failed\n");
 		return;
+	}
 	/* Initialise connection with controller. */
 	twe_init_connection(sc);
 	twe_describe_controller(sc);
 	/* Find and attach RAID array units. */
-	twe_rescan(self, "twe", 0);
+	twe_rescan(self, NULL, NULL);
 	/* ...and finally, enable interrupts. */
 	twe_outl(sc, TWE_REG_CTL, TWE_CTL_CLEAR_ATTN_INTR |
 	    TWE_CTL_UNMASK_RESP_INTR |
 	    TWE_CTL_ENABLE_INTRS);
 	/* sysctl set-up for 3ware cli */
 	if (sysctl_createv(NULL, 0, NULL, &node,
 , CTLTYPE_NODE, device_xname(self),
 				SYSCTL_DESCR("twe driver information"),
 				NULL, 0, NULL, 0,
 				CTL_HW, CTL_CREATE, CTL_EOL) != 0) {
 		aprint_error_dev(self, "could not create %s.%s sysctl node\n",
 @@ -472,27 +472,27 @@ twe_attach(device_t parent, device_t sel
 , CTLTYPE_STRING, "driver_version",
 				SYSCTL_DESCR("twe0 driver version"),
 				NULL, 0, __UNCONST(&twever), 0,
 				CTL_HW, node->sysctl_num, CTL_CREATE, CTL_EOL))
 				!= 0) {
 		aprint_error_dev(self,
 		    "could not create %s.%s.driver_version sysctl\n",
 		    "hw", device_xname(self));
 		return;
+	}
+}
 static int
-twe_rescan(device_t self, const char *attr, const int *flags)
+twe_rescan(device_t self, const char *ifattr, const int *locs)
+{
 	struct twe_softc *sc;
 	int i;
 	sc = device_private(self);
 	sc->sc_nunits = 0;
 	for (i = 0; i < TWE_MAX_UNITS; i++)
 		(void) twe_add_unit(sc, i);
 	return 0;
+}
 void