Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96ddef25 authored by Kevin Hao's avatar Kevin Hao Committed by Bjorn Helgaas
Browse files

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: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 33963e30

drivers/pci/probe.c

+2 −3
Original line number Diff line number Diff line
@@ -250,12 +250,10 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
			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 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 


		region.start = l;

		region.end = l + sz;

		pcibios_bus_to_resource(dev, res, &region);

	}



	pcibios_bus_to_resource(dev, res, &region);



	goto out;