Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753395AbbHUGWE (ORCPT ); Fri, 21 Aug 2015 02:22:04 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:24204 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753294AbbHUGV6 (ORCPT ); Fri, 21 Aug 2015 02:21:58 -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 12/52] PCI: Simplify res reference using in __assign_resources_sorted() Date: Thu, 20 Aug 2015 23:20:27 -0700 Message-Id: <1440138067-4314-13-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: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3494 Lines: 99 Use res instead of dev_res->res. Signed-off-by: Yinghai Lu --- drivers/pci/setup-bus.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index a3d48ef..9d7adab 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -452,6 +452,7 @@ static void __assign_resources_sorted(struct list_head *head, struct pci_dev_resource *dev_res, *tmp_res; unsigned long fail_type; resource_size_t add_align; + struct resource *res; /* Check if optional add_size is there */ if (!realloc_head || list_empty(realloc_head)) @@ -467,8 +468,8 @@ static void __assign_resources_sorted(struct list_head *head, /* Update res in head list with add_size in realloc_head list */ list_for_each_entry(dev_res, head, list) { - dev_res->res->end += get_res_add_size(realloc_head, - dev_res->res); + res = dev_res->res; + res->end += get_res_add_size(realloc_head, res); /* * There are two kinds of additional resources in the list: @@ -477,16 +478,16 @@ static void __assign_resources_sorted(struct list_head *head, * 2. resource with IORESOURCE_SIZEALIGN * update size above already change alignment. */ - if (!(dev_res->res->flags & IORESOURCE_STARTALIGN)) + if (!(res->flags & IORESOURCE_STARTALIGN)) continue; - add_align = get_res_add_align(realloc_head, dev_res->res); + add_align = get_res_add_align(realloc_head, res); if (add_align) { - resource_size_t r_size = resource_size(dev_res->res); + resource_size_t r_size = resource_size(res); - dev_res->res->start = add_align; - dev_res->res->end = add_align + r_size - 1; + res->start = add_align; + res->end = add_align + r_size - 1; } } @@ -508,21 +509,21 @@ static void __assign_resources_sorted(struct list_head *head, /* check failed type */ fail_type = pci_fail_res_type_mask(&local_fail_head); /* remove not need to be released assigned res from head list etc */ - list_for_each_entry_safe(dev_res, tmp_res, head, list) - if (dev_res->res->parent && - !pci_need_to_release(fail_type, dev_res->res)) { + list_for_each_entry_safe(dev_res, tmp_res, head, list) { + res = dev_res->res; + if (res->parent && !pci_need_to_release(fail_type, res)) { /* remove it from realloc_head list */ - remove_from_list(realloc_head, dev_res->res); - remove_from_list(&save_head, dev_res->res); + remove_from_list(realloc_head, res); + remove_from_list(&save_head, res); list_del(&dev_res->list); kfree(dev_res); } + } free_list(&local_fail_head); /* Release assigned resource */ list_for_each_entry(dev_res, head, list) { - struct resource *res = dev_res->res; - + res = dev_res->res; if (res->parent) { dev_printk(KERN_DEBUG, &dev_res->dev->dev, "BAR %d: released %pR\n", @@ -533,8 +534,7 @@ static void __assign_resources_sorted(struct list_head *head, } /* Restore start/end/flags from saved list */ list_for_each_entry(save_res, &save_head, list) { - struct resource *res = save_res->res; - + res = save_res->res; res->start = save_res->start; res->end = save_res->end; res->flags = save_res->flags; -- 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/