On Sun, 20 Nov 2011 15:29:46 -0600 David Fries <david@xxxxxxxxx> wrote: > From: David Fries <David@xxxxxxxxx> > > Include the driver name and device in warning when a pci driver > supports both legacy pm and new framework as just the stack trace > gives no way to identify the driver. > > Signed-off-by: David Fries <David@xxxxxxxxx> > Cc: Rafael J. Wysocki <rjw@xxxxxxx> > Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > Cc: linux-pci@xxxxxxxxxxxxxxx > --- > drivers/pci/pci-driver.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > index 12d1e81..3623d65 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -604,7 +604,8 @@ static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev) > * supported as well. Drivers are supposed to support either the > * former, or the latter, but not both at the same time. > */ > - WARN_ON(ret && drv->driver.pm); > + WARN(ret && drv->driver.pm, "driver %s device %04x:%04x\n", > + drv->name, pci_dev->vendor, pci_dev->device); > > return ret; > } Applied to linux-next, thanks. -- Jesse Barnes, Intel Open Source Technology Center
Attachment:
signature.asc
Description: PGP signature
