summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2020-10-21 09:58:35 -0500
committerBjorn Helgaas <bhelgaas@google.com>2020-10-21 09:58:35 -0500
commit5cfdc750bc6fc5ca38a04e986125641aea7d66c3 (patch)
treecc914b63b83d67c46c867e8386ccbfc6f7b18995 /drivers/pci/pci.c
parent28a18aec59551e0f86f0983c0eec7b6470632790 (diff)
parent23cce2e00b332a7f434fe9c9f2a9c07aaff2bcd7 (diff)
Merge branch 'pci/hotplug'
- Use for_each_child_of_node() and for_each_node_by_name() instead of open-coding them (Qinglang Miao) - Reduce pciehp noisiness on hot removal (Lukas Wunner) - Remove unused assignment in shpchp (Krzysztof WilczyƄski) * pci/hotplug: PCI: shpchp: Remove unused 'rc' assignment PCI: pciehp: Reduce noisiness on hot removal PCI: rpadlpar: Use for_each_child_of_node() and for_each_node_by_name()
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index f3f64016fe32..b534a5b10978 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4717,9 +4717,7 @@ static bool pcie_wait_for_link_delay(struct pci_dev *pdev, bool active,
}
if (active && ret)
msleep(delay);
- else if (ret != active)
- pci_info(pdev, "Data Link Layer Link Active not %s in 1000 msec\n",
- active ? "set" : "cleared");
+
return ret == active;
}
@@ -4844,6 +4842,7 @@ void pci_bridge_wait_for_secondary_bus(struct pci_dev *dev)
delay);
if (!pcie_wait_for_link_delay(dev, true, delay)) {
/* Did not train, no need to wait any further */
+ pci_info(dev, "Data Link Layer Link Active not set in 1000 msec\n");
return;
}
}