The patch titled input: add a shutdown method to pnp drivers has been added to the -mm tree. Its filename is input-add-a-shutdown-method-to-pnp-drivers.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: input: add a shutdown method to pnp drivers From: David Härdeman <david@xxxxxxxxxxx> 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@xxxxxx> Signed-off-by: David Härdeman <david@xxxxxxxxxxx> Cc: Dmitry Torokhov <dtor@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/pnp/driver.c | 10 ++++++++++ include/linux/pnp.h | 1 + 2 files changed, 11 insertions(+) diff -puN drivers/pnp/driver.c~input-add-a-shutdown-method-to-pnp-drivers drivers/pnp/driver.c --- a/drivers/pnp/driver.c~input-add-a-shutdown-method-to-pnp-drivers +++ a/drivers/pnp/driver.c @@ -135,6 +135,15 @@ static int pnp_device_remove(struct devi 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 @@ struct bus_type pnp_bus_type = { .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, diff -puN include/linux/pnp.h~input-add-a-shutdown-method-to-pnp-drivers include/linux/pnp.h --- a/include/linux/pnp.h~input-add-a-shutdown-method-to-pnp-drivers +++ a/include/linux/pnp.h @@ -360,6 +360,7 @@ struct pnp_driver { 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; _ Patches currently in -mm which might be from david@xxxxxxxxxxx are acpi-reintroduce-acpi_device_ops-shutdown-method.patch input-add-a-shutdown-method-to-pnp-drivers.patch input-add-a-driver-for-the-winbond-wpcd376i-consumer-ir-hardware.patch add-a-driver-for-the-winbond-wpcd376i-ir-functionality.patch add-a-driver-for-the-winbond-wpcd376i-ir-functionality-select-bitreverse.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html