 @@ -1,15 +1,15 @@
-/*	$Id: mpcsa_leds.c,v 1.8 2022/01/19 05:05:45 thorpej Exp $	*/
+/*	$Id: mpcsa_leds.c,v 1.9 2022/01/19 05:21:44 thorpej Exp $	*/
-/*	$NetBSD: mpcsa_leds.c,v 1.8 2022/01/19 05:05:45 thorpej Exp $	*/
+/*	$NetBSD: mpcsa_leds.c,v 1.9 2022/01/19 05:21:44 thorpej Exp $	*/
 /*
  * Copyright (c) 2007 Embedtronics Oy. All rights reserved.
+ *
  * Based on arch/arm/ep93xx/epgpio.c,
  * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -20,27 +20,27 @@
  * 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 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: mpcsa_leds.c,v 1.8 2022/01/19 05:05:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_leds.c,v 1.9 2022/01/19 05:21:44 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/lock.h>
 #include <sys/gpio.h>
 #include <dev/spi/spivar.h>
 #include <dev/gpio/gpiovar.h>
 #include <evbarm/mpcsa/mpcsa_leds_var.h>
 #include <evbarm/mpcsa/mpcsa_io.h>
 #include "gpio.h"
 #if NGPIO > 0
 @@ -129,30 +129,28 @@ static void
 mpcsa_leds_attach(device_t parent, device_t self, void *aux)
+{
 	struct mpcsa_leds_softc *sc = device_private(self);
 	struct spi_attach_args *sa = aux;
 #if NGPIO > 0
 	struct gpiobus_attach_args gba;
 #endif
 	int n;
 	int error;
 	aprint_naive(": output buffer\n");
 	aprint_normal(": 74HC595 or compatible shift register(s)\n");
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 10000000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 10000000);
 	if (error) {
 		aprint_error_dev(self,
 		    "failed to set Mode 0 @ 10MHz, error=%d\n", error);
 		return;
+	}
 	sc->sc_sh = sa->sa_handle;
 	sc->sc_pinstate = 0xffff;
 	callout_init(&sc->sc_c, 0);
 #if NGPIO > 0
 	/* initialize and attach gpio(4) */
 	for (n = 0; n < MPCSA_LEDS_NPINS; n++) {
 		sc->sc_pins[n].pin_num = n;
 		sc->sc_pins[n].pin_caps = (GPIO_PIN_OUTPUT
 					   | GPIO_PIN_PUSHPULL);

 @@ -1,14 +1,14 @@
-/* $NetBSD: m25p.c,v 1.19 2022/01/19 05:05:45 thorpej Exp $ */
+/* $NetBSD: m25p.c,v 1.20 2022/01/19 05:21:44 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -32,27 +32,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE 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: m25p.c,v 1.19 2022/01/19 05:05:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.20 2022/01/19 05:21:44 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/spi/spivar.h>
 #include <dev/spi/spiflash.h>
 /*
  * Device driver for STMicroelectronics M25P Family SPI Flash Devices
 @@ -132,30 +132,28 @@ m25p_match(device_t parent, cfdata_t cf,
 static void
 m25p_attach(device_t parent, device_t self, void *aux)
+{
 	struct m25p_softc *sc = device_private(self);
 	struct spi_attach_args *sa = aux;
 	int error;
 	sc->sc_sh = sa->sa_handle;
 	aprint_normal("\n");
 	aprint_naive("\n");
 	/* configure for 20MHz, which is the max for normal reads */
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 20000000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 20000000);
 	if (error) {
 		aprint_error_dev(self,
 		    "failed to set Mode 0 @ 20MHz, error=%d\n", error);
 		return;
+	}
 	config_interrupts(self, m25p_doattach);
+}
 static void
 m25p_doattach(device_t self)
+{
 	struct m25p_softc *sc = device_private(self);
 	const struct m25p_info *info;
 	uint8_t	buf[4];
 	uint8_t	cmd;

 @@ -1,14 +1,14 @@
-/* $NetBSD: spi.c,v 1.19 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: spi.c,v 1.20 2022/01/19 05:21:44 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -32,27 +32,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE 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: spi.c,v 1.19 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.20 2022/01/19 05:21:44 thorpej Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/errno.h>
 #include <dev/spi/spivar.h>
 @@ -418,31 +418,34 @@ spi_ioctl(dev_t dev, u_long cmd, void *d
 CFATTACH_DECL_NEW(spi, sizeof(struct spi_softc),
     spi_match, spi_attach, NULL, NULL);
 /*
  * Configure.  This should be the first thing that the SPI driver
  * should do, to configure which mode (e.g. SPI_MODE_0, which is the
  * same as Philips Microwire mode), and speed.  If the bus driver
  * cannot run fast enough, then it should just configure the fastest
  * mode that it can support.  If the bus driver cannot run slow
  * enough, then the device is incompatible and an error should be
  * returned.
  */
 int
-spi_configure(struct spi_handle *sh, int mode, int speed)
+spi_configure(device_t dev __unused, struct spi_handle *sh, int mode, int speed)
+{
 	sh->sh_mode = mode;
 	sh->sh_speed = speed;
 	/* No need to report errors; no failures. */
 	return 0;
+}
 /*
  * Acquire controller
  */
 static void
 spi_acquire(struct spi_handle *sh)
+{
 	struct spi_softc *sc = sh->sh_sc;
 	mutex_enter(&sc->sc_lock);
 	while ((sc->sc_flags & SPIC_BUSY) != 0)

 @@ -1,14 +1,14 @@
-/*      $NetBSD: mcp23xxxgpio_spi.c,v 1.3 2022/01/19 05:05:45 thorpej Exp $ */
+/*      $NetBSD: mcp23xxxgpio_spi.c,v 1.4 2022/01/19 05:21:44 thorpej Exp $ */
 /*-
  * Copyright (c) 2014, 2022 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank Kardel, and by Jason R. Thorpe.
+ *
  * 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: mcp23xxxgpio_spi.c,v 1.3 2022/01/19 05:05:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcp23xxxgpio_spi.c,v 1.4 2022/01/19 05:21:44 thorpej Exp $");
 /*
  * Driver for Microchip serial I/O expanders:
+ *
  *	MCP23S08	8-bit, SPI interface
  *	MCP23S17	16-bit, SPI interface
  *	MCP23S18	16-bit (open-drain outputs), SPI interface
+ *
  * Data sheet:
+ *
  *	https://ww1.microchip.com/downloads/en/DeviceDoc/20001952C.pdf
  */
 @@ -193,30 +193,28 @@ mcpgpio_spi_attach(device_t parent, devi
 	mutex_init(&ssc->sc_mutex, MUTEX_DEFAULT, IPL_NONE);
 	ssc->sc_sh = sa->sa_handle;
 	sc->sc_dev = self;
 	sc->sc_variant = &mcp23s17;		/* XXX */
 	sc->sc_iocon = IOCON_HAEN | IOCON_SEQOP;
 	sc->sc_npins = MCP23x17_GPIO_NPINS;
 	sc->sc_accessops = &mcpgpio_spi_accessops;
 	aprint_naive("\n");
 	aprint_normal(": %s I/O Expander\n", sc->sc_variant->name);
 	/* run at 10MHz */
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 10000000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 10000000);
 	if (error) {
 		aprint_error_dev(self,
 		    "failed to set Mode 0 @ 10MHz, error=%d\n", error);
 		return;
+	}
 	/*
 	 * Before we decode the topology information, ensure each
 	 * chip has IOCON.HAEN set so that it will actually decode
 	 * the address bits.
+	 *
 	 * XXX Going on blind faith that IOCON.BANK is already 0.
 	 */
 	if (sc->sc_variant->type == MCPGPIO_TYPE_23x08) {
 		error = mcpgpio_spi_write(sc, 0, REG_IOCON, sc->sc_iocon);
 	} else {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mcp3k.c,v 1.3 2022/01/19 05:05:45 thorpej Exp $ */
+/*	$NetBSD: mcp3k.c,v 1.4 2022/01/19 05:21:44 thorpej Exp $ */
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank Wille.
+ *
  * 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.
 @@ -195,30 +195,28 @@ mcp3kadc_attach(device_t parent, device_
 	sc->sc_dev = self;
 	sc->sc_sh = sa->sa_handle;
 	/* device flags define the model */
 	sc->sc_model = device_cfdata(sc->sc_dev)->cf_flags;
 	model = &mcp3k_models[sc->sc_model];
 	aprint_naive(": Analog to Digital converter\n");
 	aprint_normal(": MCP%u %u-channel %u-bit ADC\n",
 	    (unsigned)model->name, (unsigned)model->channels,
 	    (unsigned)model->bits);
 	/* configure for 1MHz */
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 1000000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 1000000);
 	if (error) {
 		aprint_error_dev(self,
 		    "failed to set Mode 0 @ 1MHz, error=%d\n", error);
 		return;
+	}
 	/* set a default Vref in mV according to the chip's ADC resolution */
 	sc->sc_vref_mv = 1 << ((model->flags & M3K_SIGNED) ?
 	    model->bits - 1 : model->bits);
 	/* remember maximum value for this ADC - also used for masking */
 	sc->sc_adc_max = (1 << model->bits) - 1;
 	/* attach voltage sensors to envsys */
 	sc->sc_sme = sysmon_envsys_create();

 @@ -1,14 +1,14 @@
-/*      $NetBSD: mcp48x1.c,v 1.2 2022/01/19 05:05:45 thorpej Exp $ */
+/*      $NetBSD: mcp48x1.c,v 1.3 2022/01/19 05:21:44 thorpej Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Radoslaw Kujawa.
+ *
  * 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: mcp48x1.c,v 1.2 2022/01/19 05:05:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcp48x1.c,v 1.3 2022/01/19 05:21:44 thorpej Exp $");
 /*
  * Driver for Microchip MCP4801/MCP4811/MCP4821 DAC.
+ *
  * XXX: needs more testing.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 @@ -129,30 +129,28 @@ mcp48x1dac_attach(device_t parent, devic
 	int error, cf_flags;
 	aprint_naive(": Digital to Analog converter\n");
 	aprint_normal(": MCP48x1 DAC\n");
 	sa = aux;
 	sc = device_private(self);
 	sc->sc_dev = self;
 	sc->sc_sh = sa->sa_handle;
 	cf_flags = device_cfdata(sc->sc_dev)->cf_flags;
 	sc->sc_dm = &mcp48x1_models[cf_flags]; /* flag value defines model */
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 20000000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 20000000);
 	if (error) {
 		aprint_error_dev(self,
 		    "failed to set Mode 0 @ 20MHz, error=%d\n", error);
 		return;
+	}
 	if(!mcp48x1dac_envsys_attach(sc)) {
 		aprint_error_dev(sc->sc_dev, "failed to attach envsys\n");
 		return;
 	};
 	sc->sc_dac_data = 0;
 	sc->sc_dac_gain = false;
 	sc->sc_dac_shutdown = false;
 	mcp48x1dac_write(sc);

 @@ -1,34 +1,34 @@
-/*	$NetBSD: scmdspi.c,v 1.2 2022/01/19 05:05:45 thorpej Exp $	*/
+/*	$NetBSD: scmdspi.c,v 1.3 2022/01/19 05:21:44 thorpej Exp $	*/
 /*
  * Copyright (c) 2021 Brad Spencer <brad@anduin.eldar.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scmdspi.c,v 1.2 2022/01/19 05:05:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scmdspi.c,v 1.3 2022/01/19 05:21:44 thorpej Exp $");
 /*
  * SPI driver for the Sparkfun Serial motor controller.
  * Uses the common scmd driver to do the real work.
 */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/conf.h>
 #include <sys/sysctl.h>
 @@ -195,30 +195,28 @@ scmdspi_attach(device_t parent, device_t
 	sc->sc_dying = false;
 	sc->sc_func_acquire_bus = &scmdspi_acquire_bus;
 	sc->sc_func_release_bus = &scmdspi_release_bus;
 	sc->sc_func_read_register = &scmdspi_read_reg;
 	sc->sc_func_write_register = &scmdspi_write_reg;
 	mutex_init(&sc->sc_mutex, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_condmutex, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_dying_mutex, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&sc->sc_condvar, "scmdspicv");
 	cv_init(&sc->sc_cond_dying, "scmdspidc");
 	/* configure for 1MHz and SPI mode 0 according to the data sheet */
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 1000000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 1000000);
 	if (error) {
 		aprint_error(": failed to set Mode 0 @ 1MHz, error=%d\n",
 		    error);
 		return;
+	}
 	/* Please note that if the pins are not set up for SPI, the attachment
 	 * will work, but it will not figure out that there are slave modules.
 	 * It is likely required that a re-enumeration be performed after the pins
 	 * are set.  This can be done from userland later.
 	 */
 	scmd_attach(sc);
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: oj6sh.c,v 1.10 2022/01/19 05:05:45 thorpej Exp $	*/
+/*	$NetBSD: oj6sh.c,v 1.11 2022/01/19 05:21:44 thorpej Exp $	*/
 /*
  * Copyright (c) 2014  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * Sharp NetWalker's Optical Joystick
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oj6sh.c,v 1.10 2022/01/19 05:05:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oj6sh.c,v 1.11 2022/01/19 05:21:44 thorpej Exp $");
 #include "opt_oj6sh.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/lock.h>
 #include <sys/callout.h>
 #include <sys/bus.h>
 #include <sys/mutex.h>
 #include <sys/workqueue.h>
 @@ -177,30 +177,28 @@ oj6sh_doattach(device_t self)
+}
 static void
 oj6sh_attach(device_t parent, device_t self, void *aux)
+{
 	struct oj6sh_softc *sc = device_private(self);
 	struct spi_attach_args *sa = aux;
 	struct wsmousedev_attach_args a;
 	int error;
 	aprint_naive("\n");
 	aprint_normal(": OJ6SH-T25 Optical Joystick\n");
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 2500000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 2500000);
 	if (error) {
 		aprint_error_dev(self,
 		    "failed to set Mode 0 @ 2.5MHz, error=%d\n", error);
 		return;
+	}
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	sc->sc_dev = self;
 	sc->sc_enabled = 0;
 	callout_init(&sc->sc_c, 0);
 	workqueue_create(&sc->sc_wq, "oj6sh",
 	    oj6sh_cb, sc, PRI_NONE, IPL_BIO, 0);
 	sc->sc_sh = sa->sa_handle;

 @@ -1,14 +1,14 @@
-/* $NetBSD: spivar.h,v 1.10 2020/08/04 13:20:45 kardel Exp $ */
+/* $NetBSD: spivar.h,v 1.11 2022/01/19 05:21:44 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -132,27 +132,27 @@ SIMPLEQ_HEAD(spi_transq, spi_transfer);
 	SIMPLEQ_INSERT_TAIL(q, trans, st_chain)
 #define	spi_transq_dequeue(q)		\
 	SIMPLEQ_REMOVE_HEAD(q, st_chain)
 #define	spi_transq_first(q)		\
 	SIMPLEQ_FIRST(q)
 #define	SPI_F_DONE		0x0001
 #define	SPI_F_ERROR		0x0002
 int spi_compatible_match(const struct spi_attach_args *, const cfdata_t,
 			  const struct device_compatible_entry *);
-int spi_configure(struct spi_handle *, int, int);
+int spi_configure(device_t, struct spi_handle *, int, int);
 int spi_transfer(struct spi_handle *, struct spi_transfer *);
 void spi_transfer_init(struct spi_transfer *);
 void spi_chunk_init(struct spi_chunk *, int, const uint8_t *, uint8_t *);
 void spi_transfer_add(struct spi_transfer *, struct spi_chunk *);
 void spi_wait(struct spi_transfer *);
 void spi_done(struct spi_transfer *, int);
 /* convenience wrappers */
 int spi_send(struct spi_handle *, int, const uint8_t *);
 int spi_recv(struct spi_handle *, int, uint8_t *);
 int spi_send_recv(struct spi_handle *, int, const uint8_t *, int, uint8_t *);
 #endif	/* _DEV_SPI_SPIVAR_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: ssdfb_spi.c,v 1.12 2022/01/19 05:05:45 thorpej Exp $ */
+/* $NetBSD: ssdfb_spi.c,v 1.13 2022/01/19 05:21:44 thorpej Exp $ */
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tobias Nygren.
+ *
  * 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: ssdfb_spi.c,v 1.12 2022/01/19 05:05:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb_spi.c,v 1.13 2022/01/19 05:21:44 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 #include <dev/spi/spivar.h>
 #include <dev/ic/ssdfbvar.h>
 #include "opt_fdt.h"
 #ifdef FDT
 #include <dev/fdt/fdtvar.h>
 #endif
 @@ -120,30 +120,28 @@ ssdfb_spi_attach(device_t parent, device
 	sc->sc.sc_cookie = (void *)sc;
 	if ((flags & SSDFB_ATTACH_FLAG_PRODUCT_MASK) == SSDFB_PRODUCT_UNKNOWN) {
 		const struct device_compatible_entry *dce =
 			device_compatible_lookup(sa->sa_compat, sa->sa_ncompat, compat_data);
 		if (dce)
 			flags |= (int)dce->value;
 		else
 			flags |= SSDFB_PRODUCT_SSD1322_GENERIC;
+	}
 	/*
 	 * SSD1306 and SSD1322 data sheets specify 100ns cycle time.
 	 */
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 10000000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 10000000);
 	if (error) {
 		aprint_error(": failed to set Mode 0 @ 10MHz, error=%d\n",
 		    error);
 		return;
+	}
 	/*
 	 * Note on interface modes.
+	 *
 	 * 3 wire mode sends 9 bit sequences over the MOSI, MSB contains
 	 * the bit that determines if the lower 8 bits are command or data.
+	 *
 	 * 4 wire mode sends 8 bit sequences and requires an auxiliary GPIO
 	 * pin for the command/data bit.
 	 */
 #ifdef FDT

 @@ -1,14 +1,14 @@
-/* $NetBSD: tmp121.c,v 1.6 2022/01/19 05:05:45 thorpej Exp $ */
+/* $NetBSD: tmp121.c,v 1.7 2022/01/19 05:21:44 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -32,27 +32,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE 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: tmp121.c,v 1.6 2022/01/19 05:05:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmp121.c,v 1.7 2022/01/19 05:21:44 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/spi/spivar.h>
 struct tmp121temp_softc {
 	struct spi_handle *sc_sh;
 @@ -75,30 +75,28 @@ tmp121temp_match(device_t parent, cfdata
+}
 static void
 tmp121temp_attach(device_t parent, device_t self, void *aux)
+{
 	struct tmp121temp_softc *sc = device_private(self);
 	struct spi_attach_args *sa = aux;
 	int error;
 	aprint_naive(": Temperature Sensor\n");
 	aprint_normal(": TI TMP121 Temperature Sensor\n");
 	/* configure for 10MHz */
-	error = spi_configure(sa->sa_handle, SPI_MODE_0, 1000000);
+	error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 1000000);
 	if (error) {
 		aprint_error_dev(self,
 		    "failed to set Mode 0 @ 10MHz, error=%d\n", error);
 		return;
+	}
 	sc->sc_sh = sa->sa_handle;
 	sc->sc_sme = sysmon_envsys_create();
 	sc->sc_sensor.units = ENVSYS_STEMP;
 	sc->sc_sensor.state = ENVSYS_SINVALID;
 	strlcpy(sc->sc_sensor.desc, device_xname(self),
 	    sizeof(sc->sc_sensor.desc));
 	if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor)) {
 		sysmon_envsys_destroy(sc->sc_sme);
 		return;