diff options
| author | Bjorn Helgaas | 2013-02-02 22:35:57 +0100 |
|---|---|---|
| committer | Bjorn Helgaas | 2013-02-02 22:35:57 +0100 |
| commit | f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c (patch) | |
| tree | 2920a8164d5243bc4c6a5e0eb006f1256ccecf66 /drivers/pci/hotplug | |
| parent | Merge branch 'pci/joe-aspm' into next (diff) | |
| parent | PCI: pciehp: Drop suspend/resume ENTRY messages (diff) | |
| download | kernel-qcow2-linux-f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c.tar.gz kernel-qcow2-linux-f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c.tar.xz kernel-qcow2-linux-f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: pciehp: Drop suspend/resume ENTRY messages
PCI: Document MPS parameters pci=pcie_bus_safe, pci=pcie_bus_perf, etc
PCI: Document hpiosize= and hpmemsize= resource reservation parameters
PCI: Use PCI Express Capability accessor
PCI: Introduce accessor to retrieve PCIe Capabilities Register
PCI: Kill pci_is_reassigndev()
Diffstat (limited to 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 916bf4f53aba..874a3baf1db0 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -294,7 +294,6 @@ static void pciehp_remove(struct pcie_device *dev) #ifdef CONFIG_PM static int pciehp_suspend (struct pcie_device *dev) { - dev_info(&dev->device, "%s ENTRY\n", __func__); return 0; } @@ -304,7 +303,6 @@ static int pciehp_resume (struct pcie_device *dev) struct slot *slot; u8 status; - dev_info(&dev->device, "%s ENTRY\n", __func__); ctrl = get_service_data(dev); /* reinitialize the chipset's event detection logic */ |