aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-05-19 20:39:07 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-05-23 14:40:49 -0400
commitd3689df04445c568c8b3dfcd8db4b562e1b18cfb (patch)
tree11e5c253120cf5f7e76e7324610934c792b76622 /drivers/pci
parent30afe8d00b994416b24c63f8c5bbf1c13869ec3c (diff)
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/setup-res.c10
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,
213 ret = pci_bus_alloc_resource(bus, res, size, align, min, 213 ret = pci_bus_alloc_resource(bus, res, size, align, min,
214 IORESOURCE_PREFETCH | IORESOURCE_MEM_64, 214 IORESOURCE_PREFETCH | IORESOURCE_MEM_64,
215 pcibios_align_resource, dev); 215 pcibios_align_resource, dev);
216 if (ret == 0)
217 return 0;
216 218
217 if (ret < 0 && 219 if ((res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) ==
218 (res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) ==
219 (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) { 220 (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) {
220 /* 221 /*
221 * That failed. 222 * That failed.
@@ -225,10 +226,11 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
225 ret = pci_bus_alloc_resource(bus, res, size, align, min, 226 ret = pci_bus_alloc_resource(bus, res, size, align, min,
226 IORESOURCE_PREFETCH, 227 IORESOURCE_PREFETCH,
227 pcibios_align_resource, dev); 228 pcibios_align_resource, dev);
229 if (ret == 0)
230 return 0;
228 } 231 }
229 232
230 if (ret < 0 && 233 if (res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) {
231 (res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64))) {
232 /* 234 /*
233 * That failed. 235 * That failed.
234 * 236 *