aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2009-09-21 20:04:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 10:17:49 -0400
commitabd6633c67925f90775bb74755f9c547e30f1f20 (patch)
tree9cb974febc1a30e3914720655cd406cea84c063e
parenta976f150a6953da5ccbd40fa6dba3bd7d56f9f67 (diff)
pnp: add a shutdown method to pnp drivers
The shutdown method is used by the winbond cir driver to setup the hardware for wake-from-S5. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: David Härdeman <david@hardeman.nu> Cc: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/pnp/driver.c10
-rw-r--r--include/linux/pnp.h1
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 527ee764c93f..cd11b113494f 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -135,6 +135,15 @@ static int pnp_device_remove(struct device *dev)
135 return 0; 135 return 0;
136} 136}
137 137
138static void pnp_device_shutdown(struct device *dev)
139{
140 struct pnp_dev *pnp_dev = to_pnp_dev(dev);
141 struct pnp_driver *drv = pnp_dev->driver;
142
143 if (drv && drv->shutdown)
144 drv->shutdown(pnp_dev);
145}
146
138static int pnp_bus_match(struct device *dev, struct device_driver *drv) 147static int pnp_bus_match(struct device *dev, struct device_driver *drv)
139{ 148{
140 struct pnp_dev *pnp_dev = to_pnp_dev(dev); 149 struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -203,6 +212,7 @@ struct bus_type pnp_bus_type = {
203 .match = pnp_bus_match, 212 .match = pnp_bus_match,
204 .probe = pnp_device_probe, 213 .probe = pnp_device_probe,
205 .remove = pnp_device_remove, 214 .remove = pnp_device_remove,
215 .shutdown = pnp_device_shutdown,
206 .suspend = pnp_bus_suspend, 216 .suspend = pnp_bus_suspend,
207 .resume = pnp_bus_resume, 217 .resume = pnp_bus_resume,
208 .dev_attrs = pnp_interface_attrs, 218 .dev_attrs = pnp_interface_attrs,
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index b063c7328ba5..fddfafaed024 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -360,6 +360,7 @@ struct pnp_driver {
360 unsigned int flags; 360 unsigned int flags;
361 int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id); 361 int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);
362 void (*remove) (struct pnp_dev *dev); 362 void (*remove) (struct pnp_dev *dev);
363 void (*shutdown) (struct pnp_dev *dev);
363 int (*suspend) (struct pnp_dev *dev, pm_message_t state); 364 int (*suspend) (struct pnp_dev *dev, pm_message_t state);
364 int (*resume) (struct pnp_dev *dev); 365 int (*resume) (struct pnp_dev *dev);
365 struct device_driver driver; 366 struct device_driver driver;