Commit 1439ccf7 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pci-v4.12-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:

 - fix another PCI_ENDPOINT build error (merged for v4.12)

 - fix error codes added to config accessors for v4.12

* tag 'pci-v4.12-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: endpoint: Select CRC32 to fix test build error
  PCI: Make error code types consistent in pci_{read,write}_config_*
parents 3a448294 98dbf5af
...@@ -896,7 +896,7 @@ int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val) ...@@ -896,7 +896,7 @@ int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val)
{ {
if (pci_dev_is_disconnected(dev)) { if (pci_dev_is_disconnected(dev)) {
*val = ~0; *val = ~0;
return -ENODEV; return PCIBIOS_DEVICE_NOT_FOUND;
} }
return pci_bus_read_config_byte(dev->bus, dev->devfn, where, val); 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) ...@@ -906,7 +906,7 @@ int pci_read_config_word(const struct pci_dev *dev, int where, u16 *val)
{ {
if (pci_dev_is_disconnected(dev)) { if (pci_dev_is_disconnected(dev)) {
*val = ~0; *val = ~0;
return -ENODEV; return PCIBIOS_DEVICE_NOT_FOUND;
} }
return pci_bus_read_config_word(dev->bus, dev->devfn, where, val); 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, ...@@ -917,7 +917,7 @@ int pci_read_config_dword(const struct pci_dev *dev, int where,
{ {
if (pci_dev_is_disconnected(dev)) { if (pci_dev_is_disconnected(dev)) {
*val = ~0; *val = ~0;
return -ENODEV; return PCIBIOS_DEVICE_NOT_FOUND;
} }
return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val); return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val);
} }
...@@ -926,7 +926,7 @@ EXPORT_SYMBOL(pci_read_config_dword); ...@@ -926,7 +926,7 @@ EXPORT_SYMBOL(pci_read_config_dword);
int pci_write_config_byte(const struct pci_dev *dev, int where, u8 val) int pci_write_config_byte(const struct pci_dev *dev, int where, u8 val)
{ {
if (pci_dev_is_disconnected(dev)) 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); return pci_bus_write_config_byte(dev->bus, dev->devfn, where, val);
} }
EXPORT_SYMBOL(pci_write_config_byte); EXPORT_SYMBOL(pci_write_config_byte);
...@@ -934,7 +934,7 @@ 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) int pci_write_config_word(const struct pci_dev *dev, int where, u16 val)
{ {
if (pci_dev_is_disconnected(dev)) 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); return pci_bus_write_config_word(dev->bus, dev->devfn, where, val);
} }
EXPORT_SYMBOL(pci_write_config_word); EXPORT_SYMBOL(pci_write_config_word);
...@@ -943,7 +943,7 @@ int pci_write_config_dword(const struct pci_dev *dev, int where, ...@@ -943,7 +943,7 @@ int pci_write_config_dword(const struct pci_dev *dev, int where,
u32 val) u32 val)
{ {
if (pci_dev_is_disconnected(dev)) 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); return pci_bus_write_config_dword(dev->bus, dev->devfn, where, val);
} }
EXPORT_SYMBOL(pci_write_config_dword); EXPORT_SYMBOL(pci_write_config_dword);
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
config PCI_EPF_TEST config PCI_EPF_TEST
tristate "PCI Endpoint Test driver" tristate "PCI Endpoint Test driver"
depends on PCI_ENDPOINT depends on PCI_ENDPOINT
select CRC32
help help
Enable this configuration option to enable the test driver Enable this configuration option to enable the test driver
for PCI Endpoint. for PCI Endpoint.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment