Backport: PCI: remove unnecessary arg of pci_update_resource()

    commit 14add80b5120966fe0659d61815b9e9b4b68fdc5
    Author: Yu Zhao <yu.zhao@intel.com>
    Date:   Sat Nov 22 02:38:52 2008 +0800

    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.).

    Signed-off-by: Yu Zhao <yu.zhao@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Yu Zhao <yu.zhao@intel.com>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 62e0d1e7dabf20ab5afd0bf265dcf590445ae7de..172e5a75fe2178921ca03f8be180bbad3bad3fc5 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -273,8 +273,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, &dev->resource[i]);
 }
 
 int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t t);

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 027084ee64871de3e911fcf0f89fd6e6c5cf28b7..37aa2107c235916aa02cbffaaa199655e16a17a9 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -56,7 +56,7 @@ static void __devinit quirk_release_resources(struct pci_dev *dev)
                        r->start = 0;
 
                        if (i < PCI_BRIDGE_RESOURCES) {
-                               pci_update_resource(dev, r, i);
+                               pci_update_resource(dev, i);
                        }
                }
                /* need to disable bridge's resource window,

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index cfab14b56a246fd396792056b5a9bd35e96ba172..c41ab2e3b2f07a2c52395287277150052840f011 100644 (file)
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -27,11 +27,12 @@
 
 
 void
-pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
+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
           for 64 bit BARs. */
@@ -183,7 +184,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
                                "%016llx - %016llx\n", resno, pci_name(dev),
                                 (unsigned long long)res->start,
                                 (unsigned long long)res->end);
-               pci_update_resource(dev, res, resno);
+               pci_update_resource(dev, resno);
        }
 
        return ret;
@@ -221,7 +222,7 @@ int pci_assign_resource_fixed(struct pci_dev *dev, int resno)
                        resno, (unsigned long long)(res->end - res->start + 1),
                        (unsigned long long)res->start, pci_name(dev));
        } 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 07c45bf31e9d40a6b422a4b3c80ae79184d758fd..e8302334132a4fe01d0f0fbee402396b1a4e9faa 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -500,7 +500,7 @@ void pci_clear_mwi(struct pci_dev *dev);
 void pci_intx(struct pci_dev *dev, int enable);
 int pci_set_dma_mask(struct pci_dev *dev, u64 mask);
 int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
-void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
+void pci_update_resource(struct pci_dev *dev, int resno);
 int pci_assign_resource(struct pci_dev *dev, int i);
 int pci_assign_resource_fixed(struct pci_dev *dev, int i);
 void pci_restore_bars(struct pci_dev *dev);