[PATCH 3/7] PCI: call pcie_flr from reset_chelsio_generic_dev
Instead of copy & pasting and old version of the code. Signed-off-by: Christoph Hellwig Acked-by: Bjorn Helgaas --- drivers/pci/quirks.c | 15 +-- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 8195ca294ee5..715ed8c08fa3 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3750,20 +3750,7 @@ static int reset_chelsio_generic_dev(struct pci_dev *dev, int probe) PCI_MSIX_FLAGS_ENABLE | PCI_MSIX_FLAGS_MASKALL); - /* -* Start of pcie_flr() code sequence. This reset code is a copy of -* the guts of pcie_flr() because that's not an exported function. -*/ - - if (!pci_wait_for_pending_transaction(dev)) - dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n"); - - pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR); - msleep(100); - - /* -* End of pcie_flr() code sequence. -*/ + pcie_flr(dev); /* * Restore the configuration information (BAR values, etc.) including -- 2.11.0
[PATCH 3/7] PCI: call pcie_flr from reset_chelsio_generic_dev
Instead of copy & pasting and old version of the code. Signed-off-by: Christoph Hellwig --- drivers/pci/quirks.c | 15 +-- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index b1775354cc69..b54c0d986f2a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3751,20 +3751,7 @@ static int reset_chelsio_generic_dev(struct pci_dev *dev, int probe) PCI_MSIX_FLAGS_ENABLE | PCI_MSIX_FLAGS_MASKALL); - /* -* Start of pcie_flr() code sequence. This reset code is a copy of -* the guts of pcie_flr() because that's not an exported function. -*/ - - if (!pci_wait_for_pending_transaction(dev)) - dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n"); - - pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR); - msleep(100); - - /* -* End of pcie_flr() code sequence. -*/ + pcie_flr(dev); /* * Restore the configuration information (BAR values, etc.) including -- 2.11.0
