iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: Simplify __pci_assign_resource() coding style

Browse Source 
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>
This commit is contained in:
Bjorn Helgaas 2014-05-19 18:39:07 -06:00
parent 30afe8d00b
commit d3689df044
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pci/setup-res.c
View File

@ -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, ret = pci_bus_alloc_resource(bus, res, size, align, min,
IORESOURCE_PREFETCH | IORESOURCE_MEM_64, IORESOURCE_PREFETCH | IORESOURCE_MEM_64,
pcibios_align_resource, dev); pcibios_align_resource, dev);
if (ret == 0)
return 0;
if (ret < 0 && if ((res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) ==
(res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) ==
(IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) { (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) {
/* /*
* That failed. * 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, ret = pci_bus_alloc_resource(bus, res, size, align, min,
IORESOURCE_PREFETCH, IORESOURCE_PREFETCH,
pcibios_align_resource, dev); pcibios_align_resource, dev);
if (ret == 0)
return 0;
} }
if (ret < 0 && if (res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64)) {
(res->flags & (IORESOURCE_PREFETCH | IORESOURCE_MEM_64))) {
/* /*
* That failed. * That failed.
* *