PCI: Rename 'added' to 'add_list'

The resource fitting algorithm uses different names from the list holding
the optional sizes: added, add_head, add_list, and realloc_head. 'add_list'
sounds the most natural and some of the related variables also use 'add'
such as 'add_size'.

To reduce variation, rename 'added' and 'add_head' to 'add_list'.  Also
rename some 'realloc_head' cases selectively to 'add_list'.

While it would be nice to rename every 'realloc_head' to 'add_list' for
consistency, it might create a backport headache with all the work going
into this algorithm that may need to be eventually backported. Thus, it's
better to leave 'realloc_head' as is for now.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20260429122617.7324-3-ilpo.jarvinen@linux.intel.com

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 4a14f88e543a26d0896cf5a0ed71f66455fc5593..4fcf5a25ad9eb7873ea9b6160572015a64905bbf 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -515,7 +515,7 @@ int pci_dev_res_add_to_list(struct list_head *head, struct pci_dev *dev,
 void __pci_bus_size_bridges(struct pci_bus *bus,
                        struct list_head *realloc_head);
 void __pci_bus_assign_resources(const struct pci_bus *bus,
-                               struct list_head *realloc_head,
+                               struct list_head *add_list,
                                struct list_head *fail_head);
 bool pci_bus_clip_resource(struct pci_dev *dev, int idx);
 void pci_walk_bus_locked(struct pci_bus *top,

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 4cf120ebe5adfcf1fb0ea09d97af72dfd85f29ee..3765693e95f0ba144d0974f8b5c6eec24f705ee8 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -756,13 +756,13 @@ out:
 }
 
 static void pdev_assign_resources_sorted(struct pci_dev *dev,
-                                        struct list_head *add_head,
+                                        struct list_head *add_list,
                                         struct list_head *fail_head)
 {
        LIST_HEAD(head);
 
        pdev_sort_resources(dev, &head);
-       __assign_resources_sorted(&head, add_head, fail_head);
+       __assign_resources_sorted(&head, add_list, fail_head);
 
 }
 
@@ -1502,13 +1502,13 @@ static void pdev_assign_fixed_resources(struct pci_dev *dev)
 }
 
 void __pci_bus_assign_resources(const struct pci_bus *bus,
-                               struct list_head *realloc_head,
+                               struct list_head *add_list,
                                struct list_head *fail_head)
 {
        struct pci_bus *b;
        struct pci_dev *dev;
 
-       pbus_assign_resources_sorted(bus, realloc_head, fail_head);
+       pbus_assign_resources_sorted(bus, add_list, fail_head);
 
        list_for_each_entry(dev, &bus->devices, bus_list) {
                pdev_assign_fixed_resources(dev);
@@ -1517,7 +1517,7 @@ void __pci_bus_assign_resources(const struct pci_bus *bus,
                if (!b)
                        continue;
 
-               __pci_bus_assign_resources(b, realloc_head, fail_head);
+               __pci_bus_assign_resources(b, add_list, fail_head);
 
                switch (dev->hdr_type) {
                case PCI_HEADER_TYPE_BRIDGE:
@@ -1613,19 +1613,19 @@ void pci_bus_claim_resources(struct pci_bus *b)
 EXPORT_SYMBOL(pci_bus_claim_resources);
 
 static void __pci_bridge_assign_resources(const struct pci_dev *bridge,
-                                         struct list_head *add_head,
+                                         struct list_head *add_list,
                                          struct list_head *fail_head)
 {
        struct pci_bus *b;
 
        pdev_assign_resources_sorted((struct pci_dev *)bridge,
-                                        add_head, fail_head);
+                                    add_list, fail_head);
 
        b = bridge->subordinate;
        if (!b)
                return;
 
-       __pci_bus_assign_resources(b, add_head, fail_head);
+       __pci_bus_assign_resources(b, add_list, fail_head);
 
        switch (bridge->class >> 8) {
        case PCI_CLASS_BRIDGE_PCI:
@@ -2303,7 +2303,7 @@ static int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *
        unsigned long type = res->flags;
        struct pci_dev_resource *dev_res;
        struct pci_dev *bridge = NULL;
-       LIST_HEAD(added);
+       LIST_HEAD(add_list);
        LIST_HEAD(failed);
        unsigned int i;
        int ret = 0;
@@ -2337,10 +2337,10 @@ static int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *
        if (!bridge)
                return -ENOENT;
 
-       __pci_bus_size_bridges(bridge->subordinate, &added);
-       __pci_bridge_assign_resources(bridge, &added, &failed);
-       if (WARN_ON_ONCE(!list_empty(&added)))
-               pci_dev_res_free_list(&added);
+       __pci_bus_size_bridges(bridge->subordinate, &add_list);
+       __pci_bridge_assign_resources(bridge, &add_list, &failed);
+       if (WARN_ON_ONCE(!list_empty(&add_list)))
+               pci_dev_res_free_list(&add_list);
 
        if (!list_empty(&failed)) {
                if (pci_required_resource_failed(&failed, type))