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>

3 files changed, 7 insertions, 6 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 9354dd63f035..c3ef2e78fc58 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -393,8 +393,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 4e375632499a..3c5203ff53c7 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 0d8bc920c2e5..c5e02f324e13 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -648,7 +648,7 @@ int pcie_get_readrq(struct pci_dev *dev);
 int pcie_set_readrq(struct pci_dev *dev, int rq);
 int pci_reset_function(struct pci_dev *dev);
 int pci_execute_reset_function(struct pci_dev *dev);
-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);