diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-02 16:35:57 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-02 16:35:57 -0500 |
commit | f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c (patch) | |
tree | 2920a8164d5243bc4c6a5e0eb006f1256ccecf66 /drivers/pci/hotplug | |
parent | ecb87e6609d3a559eacf7a61f5b4e088a797d07c (diff) | |
parent | 775c739e0b08fbffb791595a4708460fc978b5b6 (diff) |
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) | |||
294 | #ifdef CONFIG_PM | 294 | #ifdef CONFIG_PM |
295 | static int pciehp_suspend (struct pcie_device *dev) | 295 | static int pciehp_suspend (struct pcie_device *dev) |
296 | { | 296 | { |
297 | dev_info(&dev->device, "%s ENTRY\n", __func__); | ||
298 | return 0; | 297 | return 0; |
299 | } | 298 | } |
300 | 299 | ||
@@ -304,7 +303,6 @@ static int pciehp_resume (struct pcie_device *dev) | |||
304 | struct slot *slot; | 303 | struct slot *slot; |
305 | u8 status; | 304 | u8 status; |
306 | 305 | ||
307 | dev_info(&dev->device, "%s ENTRY\n", __func__); | ||
308 | ctrl = get_service_data(dev); | 306 | ctrl = get_service_data(dev); |
309 | 307 | ||
310 | /* reinitialize the chipset's event detection logic */ | 308 | /* reinitialize the chipset's event detection logic */ |