 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_com.c,v 1.1 2017/06/28 23:51:29 jmcneill Exp $ */
+/* $NetBSD: sunxi_com.c,v 1.2 2017/06/29 17:05:26 jmcneill Exp $ */
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
  * 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
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * 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(1, "$NetBSD: sunxi_com.c,v 1.1 2017/06/28 23:51:29 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_com.c,v 1.2 2017/06/29 17:05:26 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/termios.h>
 #include <dev/ic/comvar.h>
 #include <dev/fdt/fdtvar.h>
 @@ -62,28 +62,28 @@ CFATTACH_DECL_NEW(sunxi_com, sizeof(stru
 	sunxi_com_match, sunxi_com_attach, NULL, NULL);
 static int
 sunxi_com_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compatible(faa->faa_phandle, compatible);
+}
 static void
 sunxi_com_attach(device_t parent, device_t self, void *aux)
+{
-	struct sunxi_com_softc * const tsc = device_private(self);
+	struct sunxi_com_softc * const ssc = device_private(self);
-	struct com_softc * const sc = &tsc->ssc_sc;
+	struct com_softc * const sc = &ssc->ssc_sc;
 	struct fdt_attach_args * const faa = aux;
 	bus_space_handle_t bsh;
 	bus_space_tag_t bst;
 	char intrstr[128];
 	bus_addr_t addr;
 	bus_size_t size;
 	u_int reg_shift;
 	int error;
 	if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0) {
 		aprint_error(": couldn't get registers\n");
 		return;
+	}
 @@ -95,56 +95,56 @@ sunxi_com_attach(device_t parent, device
 		if (reg_shift == 2) {
 			bst = faa->faa_a4x_bst;
 		} else if (reg_shift == 0) {
 			bst = faa->faa_bst;
 		} else {
 			aprint_error(": unsupported reg-shift value %d\n",
 			    reg_shift);
 			return;
+		}
+	}
 	sc->sc_dev = self;
-	tsc->ssc_clk = fdtbus_clock_get_index(faa->faa_phandle, 0);
+	ssc->ssc_clk = fdtbus_clock_get_index(faa->faa_phandle, 0);
-	tsc->ssc_rst = fdtbus_reset_get_index(faa->faa_phandle, 0);
+	ssc->ssc_rst = fdtbus_reset_get_index(faa->faa_phandle, 0);
-	if (tsc->ssc_clk == NULL) {
+	if (ssc->ssc_clk == NULL) {
 		aprint_error(": couldn't get frequency\n");
 		return;
+	}
-	sc->sc_frequency = clk_get_rate(tsc->ssc_clk);
+	sc->sc_frequency = clk_get_rate(ssc->ssc_clk);
 	sc->sc_type = COM_TYPE_NORMAL;
 	error = bus_space_map(bst, addr, size, 0, &bsh);
 	if (error) {
 		aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
 		return;
+	}
 	COM_INIT_REGS(sc->sc_regs, bst, bsh, addr);
 	com_attach_subr(sc);
 	aprint_naive("\n");
 	if (!fdtbus_intr_str(faa->faa_phandle, 0, intrstr, sizeof(intrstr))) {
 		aprint_error_dev(self, "failed to decode interrupt\n");
 		return;
+	}
-	tsc->ssc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_SERIAL,
+	ssc->ssc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_SERIAL,
 	    FDT_INTR_MPSAFE, comintr, sc);
-	if (tsc->ssc_ih == NULL) {
+	if (ssc->ssc_ih == NULL) {
 		aprint_error_dev(self, "failed to establish interrupt on %s\n",
 		    intrstr);
+	}
 	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
+}
 /*
  * Console support
  */
 static int
 sunxi_com_console_match(int phandle)
+{