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

Commit 61e83cdd authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

PCI: Drop temporary variable in pci_assign_unassigned_resources() 



Drop the "bus" temporary variable.  No functional change, but simplifies
later patch slightly.

[bhelgaas: changelog, make same change in
pci_assign_unassigned_bridge_resources() to keep it parallel with
pci_assign_unassigned_resources()]
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 3b2f64d0

drivers/pci/setup-bus.c

+7 −10
Original line number Diff line number Diff line
@@ -1458,12 +1458,11 @@ pci_assign_unassigned_resources(void) 
	 * Try to release leaf bridge's resources that doesn't fit resource of

	 * child device under that bridge

	 */

	list_for_each_entry(fail_res, &fail_head, list) {

		bus = fail_res->dev->bus;

		pci_bus_release_bridge_resources(bus,

	list_for_each_entry(fail_res, &fail_head, list)

		pci_bus_release_bridge_resources(fail_res->dev->bus,

						 fail_res->flags & type_mask,

						 rel_type);

	}



	/* restore size and flags */

	list_for_each_entry(fail_res, &fail_head, list) {

		struct resource *res = fail_res->res;
@@ -1522,13 +1521,11 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge) 
	 * Try to release leaf bridge's resources that doesn't fit resource of

	 * child device under that bridge

	 */

	list_for_each_entry(fail_res, &fail_head, list) {

		struct pci_bus *bus = fail_res->dev->bus;

		unsigned long flags = fail_res->flags;



		pci_bus_release_bridge_resources(bus, flags & type_mask,

	list_for_each_entry(fail_res, &fail_head, list)

		pci_bus_release_bridge_resources(fail_res->dev->bus,

						 fail_res->flags & type_mask,

						 whole_subtree);

	}



	/* restore size and flags */

	list_for_each_entry(fail_res, &fail_head, list) {

		struct resource *res = fail_res->res;