PCI: Call pcie_flr() from reset_chelsio_generic_dev()
authorChristoph Hellwig <hch@lst.de>
Fri, 14 Apr 2017 19:11:27 +0000 (21:11 +0200)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 20 Apr 2017 13:53:52 +0000 (08:53 -0500)
Instead of copy & pasting and old version of the code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/quirks.c

index fd5ec86816aa7690b19670436a60bd9eb7edc434..a3a0b5a0b72c0e7fed73910c404acad8f4df95b5 100644 (file)
@@ -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