Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759005AbZIPPAL (ORCPT ); Wed, 16 Sep 2009 11:00:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758920AbZIPPAJ (ORCPT ); Wed, 16 Sep 2009 11:00:09 -0400 Received: from g1t0029.austin.hp.com ([15.216.28.36]:29659 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758486AbZIPPAI (ORCPT ); Wed, 16 Sep 2009 11:00:08 -0400 From: Bjorn Helgaas To: Andrew Morton Subject: Re: 2.6.32 -mm merge plans Date: Wed, 16 Sep 2009 09:00:09 -0600 User-Agent: KMail/1.9.10 Cc: Dmitry Torokhov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, David =?iso-8859-1?q?H=E4rdeman?= , Len Brown References: <20090915161535.db0a6904.akpm@linux-foundation.org> <20090916034650.GD2756@core.coreip.homeip.net> <20090915211408.bb614be5.akpm@linux-foundation.org> In-Reply-To: <20090915211408.bb614be5.akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200909160900.10057.bjorn.helgaas@hp.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2845 Lines: 81 On Tuesday 15 September 2009 10:14:08 pm Andrew Morton wrote: > On Tue, 15 Sep 2009 20:46:50 -0700 Dmitry Torokhov wrote: > > > 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? I think this change looks good, and I think the winbond driver uses it. I don't object to it going in via -mm so it stays together with the winbond driver itself. Bjorn > From: David H_rdeman > > The shutdown method is used by the winbond cir driver to setup the > hardware for wake-from-S5. > > Signed-off-by: Bjorn Helgaas > Signed-off-by: David H_rdeman > Cc: Dmitry Torokhov > Signed-off-by: Andrew Morton > --- > > 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; > _ > > -- 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/