diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 11:08:02 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 11:08:02 -0400 |
commit | 6dabee73d46bfafb8c588b21b14606914de97ee6 (patch) | |
tree | 140f679ec718d022e9946d8534af5cd7646340c6 /drivers/pci/pcie | |
parent | 78890b5989d96ddce989cde929c45ceeded0fcaf (diff) | |
parent | 769ae543dc8d5745e1ade88cbcf1271a96276fd2 (diff) |
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 cd46d74ec806..06bad96af415 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) | |||
509 | "resume", | 509 | "resume", |
510 | report_resume); | 510 | report_resume); |
511 | 511 | ||
512 | dev_printk(KERN_DEBUG, &dev->dev, | 512 | dev_info(&dev->dev, "AER: Device recovery successful\n"); |
513 | "AER driver successfully recovered\n"); | ||
514 | return; | 513 | return; |
515 | 514 | ||
516 | failed: | 515 | failed: |
517 | /* TODO: Should kernel panic here? */ | 516 | /* TODO: Should kernel panic here? */ |
518 | dev_printk(KERN_DEBUG, &dev->dev, | 517 | dev_info(&dev->dev, "AER: Device recovery failed\n"); |
519 | "AER driver didn't recover\n"); | ||
520 | } | 518 | } |
521 | 519 | ||
522 | /** | 520 | /** |