# HG changeset patch
# User Yu Zhao <yu.zhao@xxxxxxxxx>
# Date 1236910104 14400
# Node ID 4bc56b3855d6449abcf402f3be106102ecd667de
# Parent  ee3f8ec76f20de0e818621c8f86122427532bc3d
Backport: PCI: remove unnecessary condition check in pci_restore_bars()

    commit bc5f5a8277cb353161454b6704b3186ebcf3a2a3
    Author: Yu Zhao <yu.zhao@xxxxxxxxx>
    Date:   Sat Nov 22 02:40:00 2008 +0800

    PCI: remove unnecessary condition check in pci_restore_bars()

    Remove the unnecessary number of resources condition checks because
    the pci_update_resource() will check availability of the resources.

    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 ee3f8ec76f20 -r 4bc56b3855d6 drivers/pci/pci.c
--- a/drivers/pci/pci.c	Thu Mar 12 22:06:44 2009 -0400
+++ b/drivers/pci/pci.c	Thu Mar 12 22:08:24 2009 -0400
@@ -256,25 +256,10 @@
 void
 pci_restore_bars(struct pci_dev *dev)
 {
-	int i, numres;
+	int i;
 
-	switch (dev->hdr_type) {
-	case PCI_HEADER_TYPE_NORMAL:
-		numres = 6;
-		break;
-	case PCI_HEADER_TYPE_BRIDGE:
-		numres = 2;
-		break;
-	case PCI_HEADER_TYPE_CARDBUS:
-		numres = 1;
-		break;
-	default:
-		/* Should never get here, but just in case... */
-		return;
-	}
-
-	for (i = 0; i < numres; i++)
-		pci_update_resource(dev, &dev->resource[i]);
+	for (i = 0; i < PCI_BRIDGE_RESOURCES; i++)
+		pci_update_resource(dev, i);
 }
 
 int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t t);