FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-03 01:24:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCI: Return conventional error values from pci_revert_fw_address()

Browse Source 
Previously we returned zero for success or 1 for failure.  This changes
that so we return zero for success or a negative errno for failure.

No functional change.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2014-07-08 16:00:42 -06:00
parent 28f6dbe2c6
commit 9477883595
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,11 +166,10 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev,
{ {
struct resource *root, *conflict; struct resource *root, *conflict;
resource_size_t fw_addr, start, end; resource_size_t fw_addr, start, end;
int ret = 0;
fw_addr = pcibios_retrieve_fw_addr(dev, resno); fw_addr = pcibios_retrieve_fw_addr(dev, resno);
if (!fw_addr) if (!fw_addr)
return 1; return -ENOMEM;
start = res->start; start = res->start;
end = res->end; end = res->end;
@ -189,14 +188,13 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev,
resno, res); resno, res);
conflict = request_resource_conflict(root, res); conflict = request_resource_conflict(root, res);
if (conflict) { if (conflict) {
dev_info(&dev->dev, dev_info(&dev->dev, "BAR %d: %pR conflicts with %s %pR\n",
"BAR %d: %pR conflicts with %s %pR\n", resno, resno, res, conflict->name, conflict);
res, conflict->name, conflict);
res->start = start; res->start = start;
res->end = end; res->end = end;
ret = 1; return -EBUSY;
} }
return ret; return 0;
} }
static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev, static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
@ -305,7 +303,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
if (ret < 0) if (ret < 0)
ret = pci_revert_fw_address(res, dev, resno, size); ret = pci_revert_fw_address(res, dev, resno, size);
if (ret) if (ret < 0)
return ret; return ret;
res->flags &= ~IORESOURCE_UNSET; res->flags &= ~IORESOURCE_UNSET;