PCI: Simplify __pci_assign_resource() coding style

If an allocation succeeds, we can return success immediately.  Then we
don't have to test for success in the subsequent code.

No functional change.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 2473f091a9cc..3bdac9dc4a88 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -213,9 +213,10 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
         ret = pci_bus_alloc_resource(bus, res, size, align, min,
                                      IORESOURCE_PREFETCH | IORESOURCE_MEM_64,
                                      pcibios_align_resource, dev);
+        if (ret == 0)
+                return 0;
 
-        if (ret < 0 &&
-            (res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) ==
+        if ((res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) ==
              (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) {
                 /*
                  * That failed.
@@ -225,10 +226,11 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
                 ret = pci_bus_alloc_resource(bus, res, size, align, min,
                                              IORESOURCE_PREFETCH,
                                              pcibios_align_resource, dev);
+                if (ret == 0)
+                        return 0;
         }
 
-        if (ret < 0 &&
-            (res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64))) {
+        if (res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) {
                 /*
                  * That failed.
                  *