PCI: Drop temporary variable in pci_assign_unassigned_resources()
authorYinghai Lu <yinghai@kernel.org>
Mon, 22 Jul 2013 21:37:12 +0000 (14:37 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 25 Jul 2013 18:35:02 +0000 (12:35 -0600)
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: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/setup-bus.c

index d254e23..cb6bcbb 100644 (file)
@@ -1458,12 +1458,11 @@ again:
         * 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 @@ again:
         * 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;