Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753961AbbHUGew (ORCPT ); Fri, 21 Aug 2015 02:34:52 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:46067 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753358AbbHUGWA (ORCPT ); Fri, 21 Aug 2015 02:22:00 -0400 From: Yinghai Lu To: Bjorn Helgaas , David Miller , Benjamin Herrenschmidt , Wei Yang , TJ , Yijing Wang Cc: Andrew Morton , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v4 09/52] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare() Date: Thu, 20 Aug 2015 23:20:24 -0700 Message-Id: <1440138067-4314-10-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1440138067-4314-1-git-send-email-yinghai@kernel.org> References: <1440138067-4314-1-git-send-email-yinghai@kernel.org> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2287 Lines: 70 pdev_sort_resources() etc was used to check devices resources and put resources that need to assign to one list in sorted order. We don't do sorting in those functions anymore, so change to __assign_resources_prepare() instead. Signed-off-by: Yinghai Lu --- 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 44d63c0..1fd0b8d 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -205,8 +205,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_assign_resources_prepare(struct pci_dev *dev, struct list_head *realloc_head, struct list_head *head) { @@ -242,7 +242,7 @@ static void pdev_sort_resources(struct pci_dev *dev, } } -static void __dev_sort_resources(struct pci_dev *dev, +static void __dev_assign_resources_prepare(struct pci_dev *dev, struct list_head *realloc_head, struct list_head *head) { @@ -260,7 +260,7 @@ static void __dev_sort_resources(struct pci_dev *dev, return; } - pdev_sort_resources(dev, realloc_head, head); + pdev_assign_resources_prepare(dev, realloc_head, head); } static inline void reset_resource(struct resource *res) @@ -560,7 +560,7 @@ static void pdev_assign_resources_sorted(struct pci_dev *dev, { LIST_HEAD(head); - __dev_sort_resources(dev, add_head, &head); + __dev_assign_resources_prepare(dev, add_head, &head); __assign_resources_sorted(&head, add_head, fail_head); } @@ -573,7 +573,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_assign_resources_prepare(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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/