diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-26 15:40:34 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-26 15:40:34 -0600 |
| commit | 07f2daad094bc9e9770143cd2d619de24d84bb3e (patch) | |
| tree | 202f930177f85456a129cfb3f7b5abc9615d52a4 /drivers/pci/pci.c | |
| parent | 1193725f543c92a77c73769bc2fbe48c53275f53 (diff) | |
| parent | 5895af79158a55562753f7f05762f3bd766d32b9 (diff) | |
| download | linux-07f2daad094bc9e9770143cd2d619de24d84bb3e.tar.gz | |
Merge branch 'pci/yijing-mps-v8' into next
* pci/yijing-mps-v8:
PCI: Warn if unsafe MPS settings detected
PCI: Fix MPS peer-to-peer DMA comment syntax
PCI: Don't restrict MPS for slots below Root Ports
PCI: Simplify MPS test for Downstream Port
PCI: Remove unnecessary check for pcie_get_mps() failure
PCI: Simplify pcie_bus_configure_settings() interface
PCI: Drop "PCI-E" prefix from Max Payload Size message
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d3fdce8f3d65..4e15bc9712fd 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3939,8 +3939,6 @@ int pcie_set_readrq(struct pci_dev *dev, int rq) if (pcie_bus_config == PCIE_BUS_PERFORMANCE) { int mps = pcie_get_mps(dev); - if (mps < 0) - return mps; if (mps < rq) rq = mps; } @@ -3957,7 +3955,6 @@ EXPORT_SYMBOL(pcie_set_readrq); * @dev: PCI device to query * * Returns maximum payload size in bytes - * or appropriate error value. */ int pcie_get_mps(struct pci_dev *dev) { |