lkml.org 
[lkml]   [2008]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/16 v6] PCI: remove unnecessary arg of pci_update_resource()
    This cleanup removes unnecessary argument 'struct resource *res' in
    pci_update_resource(), so it takes same arguments as other companion
    functions (pci_assign_resource(), etc.).

    Cc: Alex Chiang <achiang@hp.com>
    Cc: Grant Grundler <grundler@parisc-linux.org>
    Cc: Greg KH <greg@kroah.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: Matthew Wilcox <matthew@wil.cx>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Roland Dreier <rdreier@cisco.com>
    Signed-off-by: Yu Zhao <yu.zhao@intel.com>

    ---
    drivers/pci/pci.c | 4 ++--
    drivers/pci/setup-res.c | 7 ++++---
    include/linux/pci.h | 2 +-
    3 files changed, 7 insertions(+), 6 deletions(-)

    diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
    index 4db261e..ae62f01 100644
    --- a/drivers/pci/pci.c
    +++ b/drivers/pci/pci.c
    @@ -376,8 +376,8 @@ pci_restore_bars(struct pci_dev *dev)
    return;
    }

    - for (i = 0; i < numres; i ++)
    - pci_update_resource(dev, &dev->resource[i], i);
    + for (i = 0; i < numres; i++)
    + pci_update_resource(dev, i);
    }

    static struct pci_platform_pm_ops *pci_platform_pm;
    diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
    index 2dbd96c..b7ca679 100644
    --- a/drivers/pci/setup-res.c
    +++ b/drivers/pci/setup-res.c
    @@ -26,11 +26,12 @@
    #include "pci.h"


    -void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
    +void pci_update_resource(struct pci_dev *dev, int resno)
    {
    struct pci_bus_region region;
    u32 new, check, mask;
    int reg;
    + struct resource *res = dev->resource + resno;

    /*
    * Ignore resources for unimplemented BARs and unused resource slots
    @@ -162,7 +163,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
    } else {
    res->flags &= ~IORESOURCE_STARTALIGN;
    if (resno < PCI_BRIDGE_RESOURCES)
    - pci_update_resource(dev, res, resno);
    + pci_update_resource(dev, resno);
    }

    return ret;
    @@ -197,7 +198,7 @@ int pci_assign_resource_fixed(struct pci_dev *dev, int resno)
    dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
    resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
    } else if (resno < PCI_BRIDGE_RESOURCES) {
    - pci_update_resource(dev, res, resno);
    + pci_update_resource(dev, resno);
    }

    return ret;
    diff --git a/include/linux/pci.h b/include/linux/pci.h
    index 085187b..43e1fc1 100644
    --- a/include/linux/pci.h
    +++ b/include/linux/pci.h
    @@ -626,7 +626,7 @@ int pcix_get_mmrbc(struct pci_dev *dev);
    int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc);
    int pcie_get_readrq(struct pci_dev *dev);
    int pcie_set_readrq(struct pci_dev *dev, int rq);
    -void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
    +void pci_update_resource(struct pci_dev *dev, int resno);
    int __must_check pci_assign_resource(struct pci_dev *dev, int i);
    int pci_select_bars(struct pci_dev *dev, unsigned long flags);

    --
    1.5.6.4


    \
     
     \ /
      Last update: 2008-10-22 11:37    [W:4.181 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site