The shutdown method is used by the winbond cir driver to setup the hardware for wake-from-S5. Changes since last version: the previous patch added a shutdown method to acpi drivers, the winbond cir driver is now a pnp driver so the shutdown method is added to pnp drivers instead. Patch by Bjorn Helgaas . Signed-off-by: Bjorn Helgaas Signed-off-by: David Härdeman Index: linux-2.6/drivers/pnp/driver.c =================================================================== --- linux-2.6.orig/drivers/pnp/driver.c 2009-07-25 19:53:32.000000000 +0200 +++ linux-2.6/drivers/pnp/driver.c 2009-07-25 19:54:21.000000000 +0200 @@ -135,6 +135,15 @@ return 0; } +static void pnp_device_shutdown(struct device *dev) +{ + struct pnp_dev *pnp_dev = to_pnp_dev(dev); + struct pnp_driver *drv = pnp_dev->driver; + + if (drv && drv->shutdown) + drv->shutdown(pnp_dev); +} + static int pnp_bus_match(struct device *dev, struct device_driver *drv) { struct pnp_dev *pnp_dev = to_pnp_dev(dev); @@ -203,6 +212,7 @@ .match = pnp_bus_match, .probe = pnp_device_probe, .remove = pnp_device_remove, + .shutdown = pnp_device_shutdown, .suspend = pnp_bus_suspend, .resume = pnp_bus_resume, .dev_attrs = pnp_interface_attrs, Index: linux-2.6/include/linux/pnp.h =================================================================== --- linux-2.6.orig/include/linux/pnp.h 2009-07-25 19:53:32.000000000 +0200 +++ linux-2.6/include/linux/pnp.h 2009-07-25 19:54:21.000000000 +0200 @@ -360,6 +360,7 @@ unsigned int flags; int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id); void (*remove) (struct pnp_dev *dev); + void (*shutdown) (struct pnp_dev *dev); int (*suspend) (struct pnp_dev *dev, pm_message_t state); int (*resume) (struct pnp_dev *dev); struct device_driver driver; -- David Härdeman -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/