aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpacpi
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2007-07-19 22:03:20 -0400
committerLen Brown <len.brown@intel.com>2007-07-22 04:18:20 -0400
commitfc30e68e88baf463683bde43347756889ba2ffae (patch)
tree3da69f1c11c10e0ad3c3663989575a5a03ef61c1 /drivers/pnp/pnpacpi
parentfd4aff1a28eecbd729b409bf7d3eff5948f20414 (diff)
ACPI, PNP: hook ACPI D-state to PNP suspend/resume
applied after Rafel's 'PM: Update global suspend and hibernation operations framework' patch set Signed-off-by: Shaohua Li <shaohua.li@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/pnpacpi')
-rw-r--r--drivers/pnp/pnpacpi/core.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index a00548799e98..c37a558ecd96 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -119,11 +119,25 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
119 return ACPI_FAILURE(status) ? -ENODEV : 0; 119 return ACPI_FAILURE(status) ? -ENODEV : 0;
120} 120}
121 121
122static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
123{
124 return acpi_bus_set_power((acpi_handle)dev->data,
125 acpi_pm_device_sleep_state(&dev->dev,
126 device_may_wakeup(&dev->dev), NULL));
127}
128
129static int pnpacpi_resume(struct pnp_dev *dev)
130{
131 return acpi_bus_set_power((acpi_handle)dev->data, ACPI_STATE_D0);
132}
133
122static struct pnp_protocol pnpacpi_protocol = { 134static struct pnp_protocol pnpacpi_protocol = {
123 .name = "Plug and Play ACPI", 135 .name = "Plug and Play ACPI",
124 .get = pnpacpi_get_resources, 136 .get = pnpacpi_get_resources,
125 .set = pnpacpi_set_resources, 137 .set = pnpacpi_set_resources,
126 .disable = pnpacpi_disable_resources, 138 .disable = pnpacpi_disable_resources,
139 .suspend = pnpacpi_suspend,
140 .resume = pnpacpi_resume,
127}; 141};
128 142
129static int __init pnpacpi_add_device(struct acpi_device *device) 143static int __init pnpacpi_add_device(struct acpi_device *device)