diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 15:08:02 (GMT) |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 15:08:02 (GMT) |
commit | 6dabee73d46bfafb8c588b21b14606914de97ee6 (patch) | |
tree | 140f679ec718d022e9946d8534af5cd7646340c6 /drivers/pci/pcie | |
parent | 78890b5989d96ddce989cde929c45ceeded0fcaf (diff) | |
parent | 769ae543dc8d5745e1ade88cbcf1271a96276fd2 (diff) | |
download | linux-6dabee73d46bfafb8c588b21b14606914de97ee6.tar.xz |
Merge branch 'pci/trivial' into next
* pci/trivial:
PCI: Drop duplicate const in DECLARE_PCI_FIXUP_SECTION
PCI: Drop bogus default from ARCH_SUPPORTS_MSI
PCI: cpqphp: Remove unreachable path
PCI: Remove bus number resource debug messages
PCI/AER: Print completion message at KERN_INFO to match starting message
PCI: Fix drivers/pci/pci.c kernel-doc warnings
Diffstat (limited to 'drivers/pci/pcie')
-rw-r--r-- | drivers/pci/pcie/aer/aerdrv_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index cd46d74..06bad96 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -509,14 +509,12 @@ static void do_recovery(struct pci_dev *dev, int severity) "resume", report_resume); - dev_printk(KERN_DEBUG, &dev->dev, - "AER driver successfully recovered\n"); + dev_info(&dev->dev, "AER: Device recovery successful\n"); return; failed: /* TODO: Should kernel panic here? */ - dev_printk(KERN_DEBUG, &dev->dev, - "AER driver didn't recover\n"); + dev_info(&dev->dev, "AER: Device recovery failed\n"); } /** |