lkml.org 
[lkml]   [2012]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/21] PCI: Move pdev_sort_resources() to setup-bus.c
    Date
    So we could move definition of struct resource_list to setup_bus.c

    later could convert resource_list to regular list.

    Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    drivers/pci/setup-bus.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
    drivers/pci/setup-res.c | 47 -----------------------------------------------
    include/linux/pci.h | 1 -
    3 files changed, 46 insertions(+), 48 deletions(-)

    diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
    index c79ce4e..f233d12 100644
    --- a/drivers/pci/setup-bus.c
    +++ b/drivers/pci/setup-bus.c
    @@ -137,6 +137,52 @@ static resource_size_t get_res_add_size(struct resource_list_x *realloc_head,
    return 0;
    }

    +/* Sort resources by alignment */
    +static void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
    +{
    + int i;
    +
    + for (i = 0; i < PCI_NUM_RESOURCES; i++) {
    + struct resource *r;
    + struct resource_list *list, *tmp;
    + resource_size_t r_align;
    +
    + r = &dev->resource[i];
    +
    + if (r->flags & IORESOURCE_PCI_FIXED)
    + continue;
    +
    + if (!(r->flags) || r->parent)
    + continue;
    +
    + r_align = pci_resource_alignment(dev, r);
    + if (!r_align) {
    + dev_warn(&dev->dev, "BAR %d: %pR has bogus alignment\n",
    + i, r);
    + continue;
    + }
    + for (list = head; ; list = list->next) {
    + resource_size_t align = 0;
    + struct resource_list *ln = list->next;
    +
    + if (ln)
    + align = pci_resource_alignment(ln->dev, ln->res);
    +
    + if (r_align > align) {
    + tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
    + if (!tmp)
    + panic("pdev_sort_resources(): "
    + "kmalloc() failed!\n");
    + tmp->next = ln;
    + tmp->res = r;
    + tmp->dev = dev;
    + list->next = tmp;
    + break;
    + }
    + }
    + }
    +}
    +
    static void __dev_sort_resources(struct pci_dev *dev,
    struct resource_list *head)
    {
    diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
    index 8b25f9c..4b1f376 100644
    --- a/drivers/pci/setup-res.c
    +++ b/drivers/pci/setup-res.c
    @@ -280,53 +280,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
    return ret;
    }

    -
    -/* Sort resources by alignment */
    -void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
    -{
    - int i;
    -
    - for (i = 0; i < PCI_NUM_RESOURCES; i++) {
    - struct resource *r;
    - struct resource_list *list, *tmp;
    - resource_size_t r_align;
    -
    - r = &dev->resource[i];
    -
    - if (r->flags & IORESOURCE_PCI_FIXED)
    - continue;
    -
    - if (!(r->flags) || r->parent)
    - continue;
    -
    - r_align = pci_resource_alignment(dev, r);
    - if (!r_align) {
    - dev_warn(&dev->dev, "BAR %d: %pR has bogus alignment\n",
    - i, r);
    - continue;
    - }
    - for (list = head; ; list = list->next) {
    - resource_size_t align = 0;
    - struct resource_list *ln = list->next;
    -
    - if (ln)
    - align = pci_resource_alignment(ln->dev, ln->res);
    -
    - if (r_align > align) {
    - tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
    - if (!tmp)
    - panic("pdev_sort_resources(): "
    - "kmalloc() failed!\n");
    - tmp->next = ln;
    - tmp->res = r;
    - tmp->dev = dev;
    - list->next = tmp;
    - break;
    - }
    - }
    - }
    -}
    -
    int pci_enable_resources(struct pci_dev *dev, int mask)
    {
    u16 cmd, old_cmd;
    diff --git a/include/linux/pci.h b/include/linux/pci.h
    index 841ba6f..aa1d0d9 100644
    --- a/include/linux/pci.h
    +++ b/include/linux/pci.h
    @@ -895,7 +895,6 @@ int pci_claim_resource(struct pci_dev *, int);
    void pci_assign_unassigned_resources(void);
    void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge);
    void pdev_enable_device(struct pci_dev *);
    -void pdev_sort_resources(struct pci_dev *, struct resource_list *);
    int pci_enable_resources(struct pci_dev *, int mask);
    void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
    int (*)(const struct pci_dev *, u8, u8));
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-01-21 11:13    [W:0.027 / U:35.432 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site