From 822cc371bd3c1e69fc2f8b31cbc3d805e20c2968 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 13 Mar 2009 08:50:44 +0000 Subject: [PATCH] Backport: PCI: remove unnecessary condition check in pci_restore_bars() commit bc5f5a8277cb353161454b6704b3186ebcf3a2a3 Author: Yu Zhao 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 Signed-off-by: Jesse Barnes Signed-off-by: Yu Zhao --- drivers/pci/pci.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 172e5a75..f810e9ee 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -256,25 +256,10 @@ pci_find_parent_resource(const struct pci_dev *dev, struct resource *res) void pci_restore_bars(struct pci_dev *dev) { - int i, numres; - - 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; - } + int i; - 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); -- 2.39.5