commit 96ddef25b24a6159e78fb53c1b13336914ff1154
author Kevin Hao <haokexin@gmail.com> Sat May 25 19:36:26 2013 +0800
committer Bjorn Helgaas <bhelgaas@google.com> Sat May 25 12:01:24 2013 -0600
tree 5974722e8f6efe01f4b948d570c37e0073e1ff24
parent 33963e308e98064ce89d961ffeede2fb055f8ffc

PCI: Consolidate calls to pcibios_bus_to_resource() in __pci_read_base()

Since we will invoke pcibios_bus_to_resource() unconditionally if we
don't goto fail, move it out of if/else wrap.  No function change.

Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

drivers/pci/probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index d40cd05..cd7b6de 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -250,12 +250,10 @@
 			pci_write_config_dword(dev, pos + 4, 0);
 			region.start = 0;
 			region.end = sz64;
-			pcibios_bus_to_resource(dev, res, &region);
 			bar_disabled = true;
 		} else {
 			region.start = l64;
 			region.end = l64 + sz64;
-			pcibios_bus_to_resource(dev, res, &region);
 		}
 	} else {
 		sz = pci_size(l, sz, mask);
@@ -265,9 +263,10 @@
 
 		region.start = l;
 		region.end = l + sz;
-		pcibios_bus_to_resource(dev, res, &region);
 	}
 
+	pcibios_bus_to_resource(dev, res, &region);
+
 	goto out;