aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/acpiphp_glue.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-07-13 17:27:25 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-07-22 22:00:25 -0400
commit07bb735378919e4b5863077f5c1b4037b6ca1a99 (patch)
treeb043b8b6f3943725f2852e5cec26d8f267a69ef1 /drivers/pci/hotplug/acpiphp_glue.c
parent236e26245a6a437c4afbf33a5ad94cf61d1a7a7c (diff)
ACPI / hotplug / PCI: Drop redundant checks from check_hotplug_bridge()
Two checks in check_hotplug_bridge() are redundant (they have been done by the caller already), so drop them. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index b136eee7a93b..f131512b7bba 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -586,16 +586,10 @@ static void check_hotplug_bridge(struct acpiphp_slot *slot, struct pci_dev *dev)
586{ 586{
587 struct acpiphp_func *func; 587 struct acpiphp_func *func;
588 588
589 if (!dev->subordinate)
590 return;
591
592 /* quirk, or pcie could set it already */ 589 /* quirk, or pcie could set it already */
593 if (dev->is_hotplug_bridge) 590 if (dev->is_hotplug_bridge)
594 return; 591 return;
595 592
596 if (PCI_SLOT(dev->devfn) != slot->device)
597 return;
598
599 list_for_each_entry(func, &slot->funcs, sibling) { 593 list_for_each_entry(func, &slot->funcs, sibling) {
600 if (PCI_FUNC(dev->devfn) == func->function) { 594 if (PCI_FUNC(dev->devfn) == func->function) {
601 dev->is_hotplug_bridge = 1; 595 dev->is_hotplug_bridge = 1;