Commit 77793854 authored by Nicholas Johnson's avatar Nicholas Johnson Committed by Bjorn Helgaas
Browse files

PCI: Remove local variable usage in pci_bus_distribute_available_resources()

In pci_bus_distribute_available_resources(), use resource_size() rather
than the local available_io, etc.  No functional change intended; this just
makes the preceding patch smaller.

[bhelgaas: extracted from https://lore.kernel.org/r/PSXP216MB0438587C47CBEDF365B1EA27803C0@PSXP216MB0438.KORP216.PROD.OUTLOOK.COM

]
Signed-off-by: default avatarNicholas Johnson <nicholas.johnson-opensource@outlook.com.au>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent d555a50f
Loading
Loading
Loading
Loading
+6 −10
Original line number Diff line number Diff line
@@ -1886,14 +1886,10 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus,
	 * calculated in __pci_bus_size_bridges() which covers all the
	 * devices currently connected to the port and below.
	 */
	available_io = resource_size(&io);
	available_mmio = resource_size(&mmio);
	available_mmio_pref = resource_size(&mmio_pref);

	extend_bridge_window(bridge, io_res, add_list, available_io);
	extend_bridge_window(bridge, mmio_res, add_list, available_mmio);
	extend_bridge_window(bridge, io_res, add_list, resource_size(&io));
	extend_bridge_window(bridge, mmio_res, add_list, resource_size(&mmio));
	extend_bridge_window(bridge, mmio_pref_res, add_list,
			     available_mmio_pref);
			     resource_size(&mmio_pref));

	/*
	 * Calculate how many hotplug bridges and normal bridges there
@@ -1929,9 +1925,9 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus,
	 * extra space reduced by the minimal required space for the
	 * non-hotplug bridges.
	 */
	remaining_io = available_io;
	remaining_mmio = available_mmio;
	remaining_mmio_pref = available_mmio_pref;
	remaining_io = available_io = resource_size(&io);
	remaining_mmio = available_mmio = resource_size(&mmio);
	remaining_mmio_pref = available_mmio_pref = resource_size(&mmio_pref);

	for_each_pci_bridge(dev, bus) {
		const struct resource *res;