 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_ec.c,v 1.55 2009/05/12 09:29:46 cegger Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.56 2009/07/06 00:54:00 alc Exp $	*/
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
  * 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
 @@ -49,27 +49,27 @@
  * working and the handlers just busy loop.
+ *
  * A callout is scheduled to compensate for missing interrupts on some
  * hardware.  If the EC doesn't process a request for 5s, it is most likely
  * in a wedged state.  No method to reset the EC is currently known.
+ *
  * Special care has to be taken to not poll the EC in a busy loop without
  * delay.  This can prevent processing of Power Button events. At least some
  * Lenovo Thinkpads seem to be implement the Power Button Override in the EC
  * and the only option to recover on those models is to cut off all power.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.55 2009/05/12 09:29:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.56 2009/07/06 00:54:00 alc Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/condvar.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_ecvar.h>
 @@ -138,28 +138,29 @@ struct acpiec_softc {
 	uint8_t sc_cur_addr, sc_cur_val;
 };
 static int acpiecdt_match(device_t, cfdata_t, void *);
 static void acpiecdt_attach(device_t, device_t, void *);
 static int acpiec_match(device_t, cfdata_t, void *);
 static void acpiec_attach(device_t, device_t, void *);
 static void acpiec_common_attach(device_t, device_t, ACPI_HANDLE,
     bus_addr_t, bus_addr_t, ACPI_HANDLE, uint8_t);
 static bool acpiec_resume(device_t PMF_FN_PROTO);
 static bool acpiec_suspend(device_t PMF_FN_PROTO);
 static bool acpiec_resume(device_t PMF_FN_PROTO);
 static bool acpiec_shutdown(device_t, int);
 static bool acpiec_parse_gpe_package(device_t, ACPI_HANDLE,
     ACPI_HANDLE *, uint8_t *);
 static void acpiec_callout(void *);
 static void acpiec_gpe_query(void *);
 static UINT32 acpiec_gpe_handler(void *);
 static ACPI_STATUS acpiec_space_setup(ACPI_HANDLE, UINT32, void *, void **);
 static ACPI_STATUS acpiec_space_handler(UINT32, ACPI_PHYSICAL_ADDRESS,
     UINT32, ACPI_INTEGER *, void *, void *);
 static void acpiec_gpe_state_machine(device_t);
 @@ -367,27 +368,28 @@ acpiec_common_attach(device_t parent, de
 		aprint_error_dev(self, "unable to enable GPE: %s\n",
 		    AcpiFormatException(rv));
 		goto post_csr_map;
+	}
 	if (kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL, acpiec_gpe_query,
 		           self, NULL, "acpiec sci thread")) {
 		aprint_error_dev(self, "unable to create query kthread\n");
 		goto post_csr_map;
+	}
 	ec_singleton = self;
-	if (!pmf_device_register(self, acpiec_suspend, acpiec_resume))
+	if (!pmf_device_register1(self, acpiec_suspend, acpiec_resume,
 	    acpiec_shutdown))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	return;
 post_csr_map:
 	(void)AcpiRemoveGpeHandler(sc->sc_gpeh, sc->sc_gpebit,
 	    acpiec_gpe_handler);
 	(void)AcpiRemoveAddressSpaceHandler(sc->sc_ech,
 	    ACPI_ADR_SPACE_EC, acpiec_space_handler);
 	bus_space_unmap(sc->sc_csr_st, sc->sc_csr_sh, 1);
 post_data_map:
 	bus_space_unmap(sc->sc_data_st, sc->sc_data_sh, 1);
+}
 @@ -399,26 +401,34 @@ acpiec_suspend(device_t dv PMF_FN_ARGS)
 	return true;
+}
 static bool
 acpiec_resume(device_t dv PMF_FN_ARGS)
+{
 	acpiec_cold = false;
 	return true;
+}
 static bool
 acpiec_shutdown(device_t dv, int how)
+{
 	acpiec_cold = true;
 	return true;
+}
 static bool
 acpiec_parse_gpe_package(device_t self, ACPI_HANDLE ec_handle,
     ACPI_HANDLE *gpe_handle, uint8_t *gpebit)
+{
 	ACPI_BUFFER buf;
 	ACPI_OBJECT *p, *c;
 	ACPI_STATUS rv;
 	rv = acpi_eval_struct(ec_handle, "_GPE", &buf);
 	if (rv != AE_OK) {
 		aprint_error_dev(self, "unable to evaluate _GPE: %s\n",
 		    AcpiFormatException(rv));
 		return false;
+	}