diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-16 20:54:52 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-16 20:54:52 +0000 |
commit | 1df130f1d47a88a3dd0b18f2ae44677f4b93ba88 (patch) | |
tree | a652303191b07ca59b5281e3606555d7db951183 /sys/dev/acpica | |
parent | efc9fddc3d53f1a277142731e435b74d304d1bef (diff) | |
parent | fc8e34d9a95f87b780f9ee3d400dd995aba2ce27 (diff) | |
download | src-1df130f1d47a88a3dd0b18f2ae44677f4b93ba88.tar.gz src-1df130f1d47a88a3dd0b18f2ae44677f4b93ba88.zip |
Merge ACPICA 20120816.
Notes
Notes:
svn path=/head/; revision=239340
Diffstat (limited to 'sys/dev/acpica')
-rw-r--r-- | sys/dev/acpica/acpi.c | 16 | ||||
-rw-r--r-- | sys/dev/acpica/acpivar.h | 5 |
2 files changed, 4 insertions, 17 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 56f4fdb7668a..cfe08ed1dbfe 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -97,9 +97,6 @@ struct mtx acpi_mutex; /* Bitmap of device quirks. */ int acpi_quirks; -/* Optional ACPI methods for suspend and resume, e.g., _GTS and _BFS. */ -int acpi_sleep_flags; - /* Supported sleep states. */ static BOOLEAN acpi_sleep_states[ACPI_S_STATE_COUNT]; @@ -292,11 +289,6 @@ SYSCTL_INT(_debug_acpi, OID_AUTO, reset_clock, CTLFLAG_RW, /* Allow users to override quirks. */ TUNABLE_INT("debug.acpi.quirks", &acpi_quirks); -/* Execute optional ACPI methods for suspend and resume. */ -TUNABLE_INT("debug.acpi.sleep_flags", &acpi_sleep_flags); -SYSCTL_INT(_debug_acpi, OID_AUTO, sleep_flags, CTLFLAG_RW | CTLFLAG_TUN, - &acpi_sleep_flags, 0, "Execute optional ACPI methods for suspend/resume."); - static int acpi_susp_bounce; SYSCTL_INT(_debug_acpi, OID_AUTO, suspend_bounce, CTLFLAG_RW, &acpi_susp_bounce, 0, "Don't actually suspend, just test devices."); @@ -1985,7 +1977,7 @@ acpi_shutdown_final(void *arg, int howto) } device_printf(sc->acpi_dev, "Powering system off\n"); intr = intr_disable(); - status = AcpiEnterSleepState(ACPI_STATE_S5, acpi_sleep_flags); + status = AcpiEnterSleepState(ACPI_STATE_S5); if (ACPI_FAILURE(status)) { intr_restore(intr); device_printf(sc->acpi_dev, "power-off failed - %s\n", @@ -2750,7 +2742,7 @@ acpi_EnterSleepState(struct acpi_softc *sc, int state) if (state != ACPI_STATE_S1) { sleep_result = acpi_sleep_machdep(sc, state); acpi_wakeup_machdep(sc, state, sleep_result, 0); - AcpiLeaveSleepStatePrep(state, acpi_sleep_flags); + AcpiLeaveSleepStatePrep(state); intr_restore(intr); /* call acpi_wakeup_machdep() again with interrupt enabled */ @@ -2763,8 +2755,8 @@ acpi_EnterSleepState(struct acpi_softc *sc, int state) if (state == ACPI_STATE_S4) AcpiEnable(); } else { - status = AcpiEnterSleepState(state, acpi_sleep_flags); - AcpiLeaveSleepStatePrep(state, acpi_sleep_flags); + status = AcpiEnterSleepState(state); + AcpiLeaveSleepStatePrep(state); intr_restore(intr); if (ACPI_FAILURE(status)) { device_printf(sc->acpi_dev, "AcpiEnterSleepState failed - %s\n", diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 4ef92b590940..81cff16eb3e2 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -215,11 +215,6 @@ extern int acpi_quirks; #define ACPI_Q_MADT_IRQ0 (1 << 2) /* - * Sleep flags. See actypes.h for available flags. - */ -extern int acpi_sleep_flags; - -/* * Note that the low ivar values are reserved to provide * interface compatibility with ISA drivers which can also * attach to ACPI. |