kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI: Simplify config space size computation

Browse source 
Restructure the logic so we return the config space size as soon as we know
it.  This reduces indentation, removes negations, and removes gotos.

No functional change.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2015-12-07 18:21:10 -06:00
parent 9f33a2ae59
commit 8e5a395a04
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/pci/probe.c
View file

@ -1107,14 +1107,11 @@ static int pci_cfg_space_size_ext(struct pci_dev *dev)
int pos = PCI_CFG_SPACE_SIZE; int pos = PCI_CFG_SPACE_SIZE;
if (pci_read_config_dword(dev, pos, &status) != PCIBIOS_SUCCESSFUL) if (pci_read_config_dword(dev, pos, &status) != PCIBIOS_SUCCESSFUL)
goto fail; return PCI_CFG_SPACE_SIZE;
if (status == 0xffffffff || pci_ext_cfg_is_aliased(dev)) if (status == 0xffffffff || pci_ext_cfg_is_aliased(dev))
goto fail; return PCI_CFG_SPACE_SIZE;
return PCI_CFG_SPACE_EXP_SIZE; return PCI_CFG_SPACE_EXP_SIZE;
fail:
return PCI_CFG_SPACE_SIZE;
} }
int pci_cfg_space_size(struct pci_dev *dev) int pci_cfg_space_size(struct pci_dev *dev)
@ -1127,19 +1124,17 @@ int pci_cfg_space_size(struct pci_dev *dev)
if (class == PCI_CLASS_BRIDGE_HOST) if (class == PCI_CLASS_BRIDGE_HOST)
return pci_cfg_space_size_ext(dev); return pci_cfg_space_size_ext(dev);
if (!pci_is_pcie(dev)) { if (pci_is_pcie(dev))
pos = pci_find_capability(dev, PCI_CAP_ID_PCIX); return pci_cfg_space_size_ext(dev);
if (!pos)
goto fail;
pci_read_config_dword(dev, pos + PCI_X_STATUS, &status); pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
if (!(status & (PCI_X_STATUS_266MHZ | PCI_X_STATUS_533MHZ))) if (!pos)
goto fail; return PCI_CFG_SPACE_SIZE;
}
return pci_cfg_space_size_ext(dev); pci_read_config_dword(dev, pos + PCI_X_STATUS, &status);
if (status & (PCI_X_STATUS_266MHZ | PCI_X_STATUS_533MHZ))
return pci_cfg_space_size_ext(dev);
fail:
return PCI_CFG_SPACE_SIZE; return PCI_CFG_SPACE_SIZE;
} }