 @@ -1,14 +1,14 @@
-/*	$NetBSD: exynos_i2c.c,v 1.11 2016/02/14 19:54:20 chs Exp $ */
+/*	$NetBSD: exynos_i2c.c,v 1.12 2017/06/11 00:54:26 jmcneill Exp $ */
 /*
  * Copyright (c) 2015 Jared D. 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.
 @@ -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.
+ *
  */
 #include "opt_exynos.h"
 #include "opt_arm_debug.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.11 2016/02/14 19:54:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.12 2017/06/11 00:54: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/kernel.h>
 #include <sys/kmem.h>
 #include <arm/samsung/exynos_reg.h>
 #include <arm/samsung/exynos_var.h>
 #include <arm/samsung/exynos_intr.h>
 @@ -128,27 +128,28 @@ exynos_i2c_match(device_t self, cfdata_t
 	const char * const compatible[] = { "samsung,s3c2440-i2c", NULL };
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compatible(faa->faa_phandle, compatible);
+}
 static void
 exynos_i2c_attach(device_t parent, device_t self, void *aux)
+{
         struct exynos_i2c_softc * const sc =  device_private(self);
 	struct fdt_attach_args * const faa = aux;
 	const int phandle = faa->faa_phandle;
 	struct i2cbus_attach_args iba;
 	prop_dictionary_t devs;
 	uint32_t address_cells;
 	char intrstr[128];
 	bus_addr_t addr;
 	bus_size_t size;
 	int error;
 	if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
 		aprint_error(": couldn't get registers\n");
 		return;
+	}
 	sc->sc_dev  = self;
 	sc->sc_bst = faa->faa_bst;
 	error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
 @@ -177,27 +178,42 @@ exynos_i2c_attach(device_t parent, devic
 	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 	fdtbus_pinctrl_set_config_index(phandle, 0);
 	sc->sc_ic.ic_cookie = sc;
 	sc->sc_ic.ic_acquire_bus = exynos_i2c_acquire_bus;
 	sc->sc_ic.ic_release_bus = exynos_i2c_release_bus;
 	sc->sc_ic.ic_send_start  = exynos_i2c_send_start;
 	sc->sc_ic.ic_send_stop   = exynos_i2c_send_stop;
 	sc->sc_ic.ic_initiate_xfer = exynos_i2c_initiate_xfer;
 	sc->sc_ic.ic_read_byte   = exynos_i2c_read_byte;
 	sc->sc_ic.ic_write_byte  = exynos_i2c_write_byte;
 	fdtbus_register_i2c_controller(self, phandle, &exynos_i2c_funcs);
 	devs = prop_dictionary_create();
 	if (of_getprop_uint32(phandle, "#address-cells", &address_cells))
 		address_cells = 1;
 	of_enter_i2c_devs(devs, phandle, address_cells * 4, 0);
 	memset(&iba, 0, sizeof(iba));
 	iba.iba_tag = &sc->sc_ic;
 	iba.iba_child_devices = prop_dictionary_get(devs, "i2c-child-devices");
 	if (iba.iba_child_devices != NULL)
 		prop_object_retain(iba.iba_child_devices);
 	else
 		iba.iba_child_devices = prop_array_create();
 	prop_object_release(devs);
 	sc->sc_i2cdev = config_found_ia(self, "i2cbus", &iba, iicbus_print);
+}
 static i2c_tag_t
 exynos_i2c_get_tag(device_t dev)
+{
 	struct exynos_i2c_softc * const sc = device_private(dev);
 	return &sc->sc_ic;
+}
 static int
 exynos_i2c_intr(void *priv)