Re: Print PCI device in power management warning.

From: Dave Jones
Date: Fri Dec 23 2011 - 15:46:55 EST


On Fri, Dec 23, 2011 at 04:26:35PM -0400, Konrad Rzeszutek Wilk wrote:

> don't you just want:
>
> WARN(ret && drv->driver.pm, "pci: %s Has both legacy and new PM
> support!\n", drv_name(drv));
>
> which will do what it previously does and also add the message you
> wanted to add?

close. Not sure what drv_name() is, but I don't seem to have it in my tree.
This works though..

---

When the WARN_ON in pci_has_legacy_pm_support() triggers, we get
users filing backtraces, but it's not obvious which driver is
triggering the trace. Printing the driver name in addition to the trace
should make these easier to debug.

Signed-off-by: Dave Jones <davej@xxxxxxxxxx>

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 12d1e81..8af9ff2 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -604,7 +604,7 @@ 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, "pci: %s Has both legacy and new PM support!\n", drv->name);

return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/