Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 449e2f9e authored by Brian Norris's avatar Brian Norris Committed by Bjorn Helgaas
Browse files

PCI: Make error code types consistent in pci_{read,write}_config_* 



Callers normally treat the config space accessors as returning PCBIOS_*
error codes, not Linux error codes (or they don't look at them at all).  We
have pcibios_err_to_errno() in case the error code needs to be translated.

Fixes: 4b103883 ("PCI: Don't attempt config access to disconnected devices")
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
parent 4d071c32

drivers/pci/access.c

+6 −6
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val) 
{

	if (pci_dev_is_disconnected(dev)) {

		*val = ~0;

		return -ENODEV;

		return PCIBIOS_DEVICE_NOT_FOUND;

	}

	return pci_bus_read_config_byte(dev->bus, dev->devfn, where, val);

}
@@ -906,7 +906,7 @@ int pci_read_config_word(const struct pci_dev *dev, int where, u16 *val) 
{

	if (pci_dev_is_disconnected(dev)) {

		*val = ~0;

		return -ENODEV;

		return PCIBIOS_DEVICE_NOT_FOUND;

	}

	return pci_bus_read_config_word(dev->bus, dev->devfn, where, val);

}
@@ -917,7 +917,7 @@ int pci_read_config_dword(const struct pci_dev *dev, int where, 
{

	if (pci_dev_is_disconnected(dev)) {

		*val = ~0;

		return -ENODEV;

		return PCIBIOS_DEVICE_NOT_FOUND;

	}

	return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val);

}
@@ -926,7 +926,7 @@ EXPORT_SYMBOL(pci_read_config_dword); 
int pci_write_config_byte(const struct pci_dev *dev, int where, u8 val)

{

	if (pci_dev_is_disconnected(dev))

		return -ENODEV;

		return PCIBIOS_DEVICE_NOT_FOUND;

	return pci_bus_write_config_byte(dev->bus, dev->devfn, where, val);

}

EXPORT_SYMBOL(pci_write_config_byte);
@@ -934,7 +934,7 @@ EXPORT_SYMBOL(pci_write_config_byte); 
int pci_write_config_word(const struct pci_dev *dev, int where, u16 val)

{

	if (pci_dev_is_disconnected(dev))

		return -ENODEV;

		return PCIBIOS_DEVICE_NOT_FOUND;

	return pci_bus_write_config_word(dev->bus, dev->devfn, where, val);

}

EXPORT_SYMBOL(pci_write_config_word);
@@ -943,7 +943,7 @@ int pci_write_config_dword(const struct pci_dev *dev, int where, 
					 u32 val)

{

	if (pci_dev_is_disconnected(dev))

		return -ENODEV;

		return PCIBIOS_DEVICE_NOT_FOUND;

	return pci_bus_write_config_dword(dev->bus, dev->devfn, where, val);

}

EXPORT_SYMBOL(pci_write_config_dword);