Patchwork [1/6] PCI: Use list_for_each_entry() for bus->devices traversal

login
register
mail settings
Submitter Bjorn Helgaas
Date Aug. 16, 2012, 11:26 p.m.
Message ID <20120816232620.3662.90438.stgit@bhelgaas.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/178124/
State Superseded
Headers show

Comments

Bjorn Helgaas - Aug. 16, 2012, 11:26 p.m.
Replace list_for_each() + pci_dev_b() with the simpler
list_for_each_entry().

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/remove.c |   28 ++++++++++++++--------------
 drivers/pci/search.c |    4 +---
 2 files changed, 15 insertions(+), 17 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas - Aug. 17, 2012, 11:37 p.m.
On Thu, Aug 16, 2012 at 5:26 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> Replace list_for_each() + pci_dev_b() with the simpler
> list_for_each_entry().

This series of 6 patches is obsoleted by "[PATCH v2 00/16] Clean up
drivers/pci/remove.c", posted 8/17.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 04a4861..d867056 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -111,22 +111,24 @@  void pci_stop_and_remove_bus_device(struct pci_dev *dev)
 	__pci_remove_bus_device(dev);
 }
 
-static void __pci_remove_behind_bridge(struct pci_dev *dev)
+static void __pci_remove_behind_bridge(struct pci_dev *bridge)
 {
-	struct list_head *l, *n;
+	struct pci_bus *bus = bridge->subordinate;
+	struct pci_dev *dev, *tmp;
 
-	if (dev->subordinate)
-		list_for_each_safe(l, n, &dev->subordinate->devices)
-			__pci_remove_bus_device(pci_dev_b(l));
+	if (bus)
+		list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list)
+			__pci_remove_bus_device(dev);
 }
 
-static void pci_stop_behind_bridge(struct pci_dev *dev)
+static void pci_stop_behind_bridge(struct pci_dev *bridge)
 {
-	struct list_head *l, *n;
+	struct pci_bus *bus = bridge->subordinate;
+	struct pci_dev *dev, *tmp;
 
-	if (dev->subordinate)
-		list_for_each_safe(l, n, &dev->subordinate->devices)
-			pci_stop_bus_device(pci_dev_b(l));
+	if (bus)
+		list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list)
+			pci_stop_bus_device(dev);
 }
 
 /**
@@ -146,7 +148,7 @@  void pci_stop_and_remove_behind_bridge(struct pci_dev *dev)
 
 static void pci_stop_bus_devices(struct pci_bus *bus)
 {
-	struct list_head *l, *n;
+	struct pci_dev *dev, *tmp;
 
 	/*
 	 * VFs could be removed by pci_stop_and_remove_bus_device() in the
@@ -156,10 +158,8 @@  static void pci_stop_bus_devices(struct pci_bus *bus)
 	 * We can iterate the list backwards to get prev valid PF instead
 	 *  of removed VF.
 	 */
-	list_for_each_prev_safe(l, n, &bus->devices) {
-		struct pci_dev *dev = pci_dev_b(l);
+	list_for_each_entry_safe_reverse(dev, tmp, &bus->devices, bus_list)
 		pci_stop_bus_device(dev);
-	}
 }
 
 /**
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 993d4a0..b169390 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -132,14 +132,12 @@  pci_find_next_bus(const struct pci_bus *from)
  */
 struct pci_dev * pci_get_slot(struct pci_bus *bus, unsigned int devfn)
 {
-	struct list_head *tmp;
 	struct pci_dev *dev;
 
 	WARN_ON(in_interrupt());
 	down_read(&pci_bus_sem);
 
-	list_for_each(tmp, &bus->devices) {
-		dev = pci_dev_b(tmp);
+	list_for_each_entry(dev, &bus->devices, bus_list) {
 		if (dev->devfn == devfn)
 			goto out;
 	}