 @@ -1,14 +1,14 @@
-/*	$NetBSD: sun4i_spi.c,v 1.1 2019/08/03 13:28:42 tnn Exp $	*/
+/*	$NetBSD: sun4i_spi.c,v 1.2 2019/08/03 19:56:42 tnn Exp $	*/
 /*
  * Copyright (c) 2019 Tobias Nygren
  * Copyright (c) 2018 Jonathan A. Kollasch
  * 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
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,27 +18,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 COPYRIGHT HOLDER 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: sun4i_spi.c,v 1.1 2019/08/03 13:28:42 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.2 2019/08/03 19:56:42 tnn Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/bitops.h>
 #include <dev/spi/spivar.h>
 #include <arm/sunxi/sun4i_spireg.h>
 #include <dev/fdt/fdtvar.h>
 static const char * const compatible[] = {
 @@ -63,27 +63,27 @@ struct sun4ispi_softc {
 #define SPIREG_READ(sc, reg) \
     bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
 #define SPIREG_WRITE(sc, reg, val) \
     bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
 static int sun4ispi_match(device_t, cfdata_t, void *);
 static void sun4ispi_attach(device_t, device_t, void *);
 static int sun4ispi_configure(void *, int, int, int);
 static int sun4ispi_transfer(void *, struct spi_transfer *);
 static void sun4ispi_txfifo_fill(struct sun4ispi_softc * const, size_t);
 static void sun4ispi_rxfifo_drain(struct sun4ispi_softc * const, size_t);
-static void sun4ispi_rxtx(struct sun4ispi_softc *);
+static void sun4ispi_rxtx(struct sun4ispi_softc * const);
 static void sun4ispi_set_interrupt_mask(struct sun4ispi_softc * const);
 static void sun4ispi_start(struct sun4ispi_softc * const);
 static int sun4ispi_intr(void *);
 CFATTACH_DECL_NEW(sun4i_spi, sizeof(struct sun4ispi_softc),
     sun4ispi_match, sun4ispi_attach, NULL, NULL);
 static int
 sun4ispi_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compatible(faa->faa_phandle, compatible);
 @@ -129,27 +129,27 @@ sun4ispi_attach(device_t parent, device_
 	    | SPI_CTL_TF_RST | SPI_CTL_MODE);
 	SPIREG_WRITE(sc, SPI_DMACTL, 0);
 	SPIREG_WRITE(sc, SPI_WAIT, 0);
 	SPIREG_WRITE(sc, SPI_INTCTL, 0);
 	SPIREG_WRITE(sc, SPI_INT_STA, ~0);
 	if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
 		aprint_error(": failed to decode interrupt\n");
 		return;
+	}
 	sc->sc_intrh = fdtbus_intr_establish(phandle, 0, IPL_VM, 0, sun4ispi_intr, sc);
 	if (sc->sc_intrh == NULL) {
-		aprint_error("unable to establish interrupt\n");
+		aprint_error(": unable to establish interrupt\n");
 		return;
+	}
 	aprint_naive("\n");
 	aprint_normal(": SPI\n");
 	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 	sc->sc_spi.sct_cookie = sc;
 	sc->sc_spi.sct_configure = sun4ispi_configure;
 	sc->sc_spi.sct_transfer = sun4ispi_transfer;
 	(void) of_getprop_uint32(phandle, "num-cs", &sc->sc_spi.sct_nslaves);
 	sba.sba_controller = &sc->sc_spi;