lkml.org 
[lkml]   [2015]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 30/60] PCI: Remove duplicated code for resource sorting
    Date
    Now sort_resources() and pdev_sort_resources() all have sorting
    code.

    As we are going to call sort_resources() several places later for
    alt_size support, so choose to remove related code in
    pdev_sort_resources().

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    drivers/pci/setup-bus.c | 22 +++-------------------
    1 file changed, 3 insertions(+), 19 deletions(-)

    diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
    index 5ea06c6..bcf7cba 100644
    --- a/drivers/pci/setup-bus.c
    +++ b/drivers/pci/setup-bus.c
    @@ -214,9 +214,8 @@ static void pdev_sort_resources(struct pci_dev *dev,

    for (i = 0; i < PCI_NUM_RESOURCES; i++) {
    struct resource *r;
    - struct pci_dev_resource *dev_res, *tmp;
    + struct pci_dev_resource *tmp;
    resource_size_t r_align;
    - struct list_head *n;

    r = &dev->resource[i];

    @@ -239,22 +238,7 @@ static void pdev_sort_resources(struct pci_dev *dev,
    tmp->res = r;
    tmp->dev = dev;

    - /* fallback is smallest one or list is empty*/
    - n = head;
    - list_for_each_entry(dev_res, head, list) {
    - resource_size_t align;
    -
    - align = __pci_resource_alignment(dev_res->dev,
    - dev_res->res,
    - realloc_head);
    -
    - if (r_align > align) {
    - n = &dev_res->list;
    - break;
    - }
    - }
    - /* Insert it just before n*/
    - list_add_tail(&tmp->list, n);
    + list_add_tail(&tmp->list, head);
    }
    }

    @@ -563,9 +547,9 @@ static void __assign_resources_sorted(struct list_head *head,
    }
    free_list(&save_head);

    +requested_and_reassign:
    sort_resources(head);

    -requested_and_reassign:
    /* Satisfy the must-have resource requests */
    assign_requested_resources_sorted(head, fail_head);

    --
    1.8.4.5


    \
     
     \ /
      Last update: 2015-10-09 00:01    [W:4.484 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site