# HG changeset patch
# User Yu Zhao <yu.zhao@xxxxxxxxx>
# Date 1236909787 14400
# Node ID c0e566166776cb7e096ee182bde557554fa4167e
# Parent  b9b4e811af229682d7c6a70aabffd5ade5876c91
Backport: PCI: remove unnecessary arg of pci_update_resource()

    commit 14add80b5120966fe0659d61815b9e9b4b68fdc5
    Author: Yu Zhao <yu.zhao@xxxxxxxxx>
    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@xxxxxxxxx>
    Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>

Signed-off-by: Yu Zhao <yu.zhao@xxxxxxxxx>

diff -r b9b4e811af22 -r c0e566166776 drivers/pci/pci.c
--- a/drivers/pci/pci.c	Thu Mar 12 22:00:05 2009 -0400
+++ b/drivers/pci/pci.c	Thu Mar 12 22:03:07 2009 -0400
@@ -273,8 +273,8 @@
 		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 -r b9b4e811af22 -r c0e566166776 drivers/pci/quirks.c
--- a/drivers/pci/quirks.c	Thu Mar 12 22:00:05 2009 -0400
+++ b/drivers/pci/quirks.c	Thu Mar 12 22:03:07 2009 -0400
@@ -56,7 +56,7 @@
 			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 -r b9b4e811af22 -r c0e566166776 drivers/pci/setup-res.c
--- a/drivers/pci/setup-res.c	Thu Mar 12 22:00:05 2009 -0400
+++ b/drivers/pci/setup-res.c	Thu Mar 12 22:03:07 2009 -0400
@@ -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 @@
 				"%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 @@
 			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 -r b9b4e811af22 -r c0e566166776 include/linux/pci.h
--- a/include/linux/pci.h	Thu Mar 12 22:00:05 2009 -0400
+++ b/include/linux/pci.h	Thu Mar 12 22:03:07 2009 -0400
@@ -500,7 +500,7 @@
 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);