diff options
Diffstat (limited to 'sys/arch/arm/xscale/pxa2x0_apm.c')
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_apm.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_apm.c b/sys/arch/arm/xscale/pxa2x0_apm.c index 7d4a97388a3..71561fed1be 100644 --- a/sys/arch/arm/xscale/pxa2x0_apm.c +++ b/sys/arch/arm/xscale/pxa2x0_apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_apm.c,v 1.42 2014/03/13 03:52:55 dlg Exp $ */ +/* $OpenBSD: pxa2x0_apm.c,v 1.43 2014/09/20 09:28:24 kettenis Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -306,7 +306,6 @@ apm_power_info(struct pxa2x0_apm_softc *sc, void apm_suspend(struct pxa2x0_apm_softc *sc) { - struct device *mainbus = device_mainbus(); int s; #if NWSDISPLAY > 0 @@ -321,14 +320,14 @@ apm_suspend(struct pxa2x0_apm_softc *sc) sc->sc_suspend(sc); s = splhigh(); - config_suspend(mainbus, DVACT_SUSPEND); + config_suspend_all(DVACT_SUSPEND); /* XXX * Flag to disk drivers that they should "power down" the disk * when we get to DVACT_POWERDOWN. */ boothowto |= RB_POWERDOWN; - config_suspend(mainbus, DVACT_POWERDOWN); + config_suspend_all(DVACT_POWERDOWN); boothowto &= ~RB_POWERDOWN; splx(s); @@ -339,11 +338,10 @@ apm_suspend(struct pxa2x0_apm_softc *sc) void apm_resume(struct pxa2x0_apm_softc *sc) { - struct device *mainbus = device_mainbus(); int s; s = splhigh(); - config_suspend(mainbus, DVACT_RESUME); + config_suspend_all(DVACT_RESUME); splx(s); inittodr(0); @@ -357,7 +355,7 @@ apm_resume(struct pxa2x0_apm_softc *sc) bufq_restart(); - config_suspend(mainbus, DVACT_WAKEUP); + config_suspend_all(DVACT_WAKEUP); #if NWSDISPLAY > 0 wsdisplay_resume(); |