 @@ -1,14 +1,14 @@
-/*	$NetBSD: tps65217pmic.c,v 1.8 2014/01/08 16:45:14 jakllsch Exp $ */
+/*	$NetBSD: tps65217pmic.c,v 1.9 2014/01/08 16:49:48 jakllsch Exp $ */
 /*-
  * Copyright (c) 2013 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.
 @@ -25,43 +25,43 @@
  * 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.
  */
 /*
  * Texas Instruments TPS65217 Power Management IC driver.
  * TODO: battery, sequencer, pgood
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tps65217pmic.c,v 1.8 2014/01/08 16:45:14 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tps65217pmic.c,v 1.9 2014/01/08 16:49:48 jakllsch Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/i2c/tps65217pmicreg.h>
 #define NTPS_REG	7
 #define SNUM_REGS	NTPS_REG-1
 #define SNUM_USBSTATUS	NTPS_REG
 #define SNUM_ACSTATUS	NTPS_REG+1
 struct tps65217pmic_softc {
 	device_t		sc_dev;
 	i2c_tag_t		sc_tag;
 	i2c_addr_t		sc_addr;
 	uint8_t			sc_version;
 	uint8_t			sc_revision;
 	kmutex_t		sc_lock;
 @@ -330,41 +330,41 @@ tps65217pmic_attach(device_t parent, dev
 	tps65217pmic_print_ppath(sc);
 	tps65217pmic_print_ldos(sc);
 	tps65217pmic_power_monitor_init(sc);
 	tps65217pmic_envsys_register(sc);
+}
 static void
 tps65217pmic_power_monitor_init(struct tps65217pmic_softc *sc)
+{
 	uint8_t intr, intrmask, status, ppath;
 	intrmask = TPS65217PMIC_INT_USBM | TPS65217PMIC_INT_ACM |
 	    TPS65217PMIC_INT_PBM;
 	status = tps65217pmic_reg_read(sc, TPS65217PMIC_STATUS);
 	ppath = tps65217pmic_reg_read(sc, TPS65217PMIC_PPATH);
 	/* acknowledge and disregard whatever interrupt was generated earlier */
 	intr = tps65217pmic_reg_read(sc, TPS65217PMIC_INT);
 	sc->sc_usbstatus = status & TPS65217PMIC_STATUS_USBPWR;
 	sc->sc_acstatus = status & TPS65217PMIC_STATUS_ACPWR;
 	sc->sc_usbenabled = ppath & TPS65217PMIC_PPATH_USB_EN;
 	sc->sc_acenabled = ppath & TPS65217PMIC_PPATH_AC_EN;
 	if (intr & intrmask)
 		aprint_normal_dev(sc->sc_dev,
 		    "WARNING: hardware interrupt enabled but not supported");
 	/* set up callout to poll for power source changes */
 	callout_init(&sc->sc_powerpollco, 0);
 	callout_setfunc(&sc->sc_powerpollco, tps65217pmic_power_monitor, sc);
 	callout_schedule(&sc->sc_powerpollco, hz);
+}
 static void
 tps65217pmic_power_monitor(void *aux)
+{
 	struct tps65217pmic_softc *sc;
 @@ -373,41 +373,41 @@ tps65217pmic_power_monitor(void *aux)
 	sc = aux;
 	mutex_enter(&sc->sc_lock);
 	status = tps65217pmic_reg_read(sc, TPS65217PMIC_STATUS);
 	usbstatus = status & TPS65217PMIC_STATUS_USBPWR;
 	acstatus = status & TPS65217PMIC_STATUS_ACPWR;
 	if (usbstatus != sc->sc_usbstatus) {
 		sc->sc_usbstatus = usbstatus;
 		pmf_event_inject(NULL, PMFE_POWER_CHANGED);
 		if (usbstatus)
 			aprint_normal_dev(sc->sc_dev,
 			    "USB power source connected\n");
 		else
 			aprint_normal_dev(sc->sc_dev,
 			    "USB power source disconnected\n");
+	}
 	if (acstatus != sc->sc_acstatus) {
 		sc->sc_acstatus = acstatus;
 		pmf_event_inject(NULL, PMFE_POWER_CHANGED);
 		if (acstatus) {
 			sysmon_pswitch_event(&sc->sc_smpsw,
 			    PSWITCH_EVENT_PRESSED);
 		} else {
 			sysmon_pswitch_event(&sc->sc_smpsw,
 			    PSWITCH_EVENT_RELEASED);
+		}
+	}
 	mutex_exit(&sc->sc_lock);
 	callout_schedule(&sc->sc_powerpollco, hz);
+}
 static void
 tps65217pmic_reg_refresh(struct tps65217pmic_softc *sc)
+{
 	int i;
 @@ -645,36 +645,36 @@ tps65217pmic_envsys_register(struct tps6
 		    sizeof(sc->sc_regsensor[i].desc));
 		sc->sc_regsensor[i].units = ENVSYS_SVOLTS_DC;
 		sc->sc_regsensor[i].state = ENVSYS_SINVALID;
 		if (sysmon_envsys_sensor_attach(sc->sc_sme,
 		    &sc->sc_regsensor[i]))
 			aprint_error_dev(sc->sc_dev,
 			    "error attaching regulator sensor %d\n", i);
+	}
 	/* attach power source indicators */
 	strcpy(sc->sc_usbsensor.desc, "USB power source"); /* SNUM_USBSTATUS */
 	sc->sc_usbsensor.units = ENVSYS_INDICATOR;
 	sc->sc_usbsensor.state = ENVSYS_SINVALID;
 	if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_usbsensor))
 		aprint_error_dev(sc->sc_dev,
 		    "error attaching USB power source sensor\n");
 	strcpy(sc->sc_acsensor.desc, "AC power source"); /* SNUM_ACSTATUS */
 	sc->sc_acsensor.units = ENVSYS_INDICATOR;
 	sc->sc_acsensor.state = ENVSYS_SINVALID;
 	if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_acsensor))
 		aprint_error_dev(sc->sc_dev,
-	 	    "error attaching AC power source sensor\n");
+		    "error attaching AC power source sensor\n");
 	/* register everything in sysmon */
 	sc->sc_sme->sme_name = device_xname(sc->sc_dev);
 	sc->sc_sme->sme_cookie = sc;
 	sc->sc_sme->sme_refresh = tps65217pmic_envsys_refresh;
 	if (sysmon_envsys_register(sc->sc_sme)) {
 		aprint_error_dev(sc->sc_dev, "unable to register in sysmon\n");
 		sysmon_envsys_destroy(sc->sc_sme);
+	}
+}
 static void