提交 d3689df0 编写于 作者: B Bjorn Helgaas

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: NBjorn Helgaas <bhelgaas@google.com>
上级 30afe8d0
...@@ -213,9 +213,10 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev, ...@@ -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, ...@@ -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.
* *
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册