We don't do sorting in those functions anymore, so change "sort" to "check" instead.
Signed-off-by: Yinghai Lu <[email protected]> --- drivers/pci/setup-bus.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 6642a60..292f2a5 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -206,8 +206,8 @@ static resource_size_t __pci_resource_alignment( return r_align; } -/* Sort resources by alignment */ -static void pdev_sort_resources(struct pci_dev *dev, +/* check resources and save to the list */ +static void pdev_check_resources(struct pci_dev *dev, struct list_head *realloc_head, struct list_head *head) { @@ -243,7 +243,7 @@ static void pdev_sort_resources(struct pci_dev *dev, } } -static void __dev_sort_resources(struct pci_dev *dev, +static void __dev_check_resources(struct pci_dev *dev, struct list_head *realloc_head, struct list_head *head) { @@ -261,7 +261,7 @@ static void __dev_sort_resources(struct pci_dev *dev, return; } - pdev_sort_resources(dev, realloc_head, head); + pdev_check_resources(dev, realloc_head, head); } static inline void reset_resource(struct resource *res) @@ -561,7 +561,7 @@ static void pdev_assign_resources_sorted(struct pci_dev *dev, { LIST_HEAD(head); - __dev_sort_resources(dev, add_head, &head); + __dev_check_resources(dev, add_head, &head); __assign_resources_sorted(&head, add_head, fail_head); } @@ -574,7 +574,7 @@ static void pbus_assign_resources_sorted(const struct pci_bus *bus, LIST_HEAD(head); list_for_each_entry(dev, &bus->devices, bus_list) - __dev_sort_resources(dev, realloc_head, &head); + __dev_check_resources(dev, realloc_head, &head); __assign_resources_sorted(&head, realloc_head, fail_head); } -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
