From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932251AbbG0XbK (ORCPT ); Mon, 27 Jul 2015 19:31:10 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:18935 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932193AbbG0XbD (ORCPT ); Mon, 27 Jul 2015 19:31:03 -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 v3 12/51] PCI: Simplify res reference using in __assign_resourcs_sorted Date: Mon, 27 Jul 2015 16:29:30 -0700 Message-Id: <1438039809-24957-13-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1438039809-24957-1-git-send-email-yinghai@kernel.org> References: <1438039809-24957-1-git-send-email-yinghai@kernel.org> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 6dff258..06664db 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -453,6 +453,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)) @@ -468,8 +469,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: @@ -478,16 +479,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; } } @@ -509,21 +510,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", @@ -534,8 +535,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