Re: 2.6.32 -mm merge plans

Andrew Morton
2009-09-16T04:14:20Z

On Tue, 15 Sep 2009 20:46:50 -0700 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:

> Hi Andrew,
>
> On Tue, Sep 15, 2009 at 04:15:35PM -0700, Andrew Morton wrote:
> >
> > input-touchpad-not-detected-on-asus-g1s.patch
>
> This one has been in mainline for a while now, please drop.

Thanks.

> > input-add-a-shutdown-method-to-pnp-drivers.patch
>
> This should go through PNP tree (do we have one?).

Not really. Bjorn heeps an eye on pnp. Sometimes merges through acpi,
sometimes through -mm.

I'll merge it I guess, but where is the corresponding change to the
winbond driver?

From: David H_rdeman <david@hardeman.nu>

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>
---

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;
_