PCI: Refactor find_bus_resource_of_type() logic checks

Reorder the logic checks in find_bus_resource_of_type() to simplify them.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20250829131113.36754-6-ilpo.jarvinen@linux.intel.com

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 4097d8703b8f174ca00e08fc88bab4c54b5392bb..c5fc4e2825be3eebe4c3243a62595899bb891970 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -158,11 +158,15 @@ static struct resource *find_bus_resource_of_type(struct pci_bus *bus,
        struct resource *r, *r_assigned = NULL;
 
        pci_bus_for_each_resource(bus, r) {
-               if (r == &ioport_resource || r == &iomem_resource)
+               if (!r || r == &ioport_resource || r == &iomem_resource)
                        continue;
-               if (r && (r->flags & type_mask) == type && !r->parent)
+
+               if ((r->flags & type_mask) != type)
+                       continue;
+
+               if (!r->parent)
                        return r;
-               if (r && (r->flags & type_mask) == type && !r_assigned)
+               if (!r_assigned)
                        r_assigned = r;
        }
        return r_assigned;