PCI/ERR: Combine pci_channel_io_frozen cases

pcie_do_recovery() had two "if (state == pci_channel_io_frozen)" cases
right after each other.  Combine them to make this easier to read.  No
functional change intended.

Link: https://lore.kernel.org/r/20200317170654.GA23125@infradead.org
[bhelgaas: split from https://lore.kernel.org/r/a255fcb3a3fdebcd90f84e08b555f1786eb8eba2.1585000084.git.sathyanarayanan.kuppuswamy@linux.intel.com]
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index 01dfc8bb7ca072c10404e222f0b1a2ef648d4219..cf97e068e12a97d42387f292a239ea75082ca546 100644 (file)
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -203,14 +203,13 @@ void pcie_do_recovery(struct pci_dev *dev, enum pci_channel_state state,
        bus = dev->subordinate;
 
        pci_dbg(dev, "broadcast error_detected message\n");
-       if (state == pci_channel_io_frozen)
+       if (state == pci_channel_io_frozen) {
                pci_walk_bus(bus, report_frozen_detected, &status);
-       else
+               if (reset_link(dev, service) != PCI_ERS_RESULT_RECOVERED)
+                       goto failed;
+       } else {
                pci_walk_bus(bus, report_normal_detected, &status);
-
-       if (state == pci_channel_io_frozen &&
-           reset_link(dev, service) != PCI_ERS_RESULT_RECOVERED)
-               goto failed;
+       }
 
        if (status == PCI_ERS_RESULT_CAN_RECOVER) {
                status = PCI_ERS_RESULT_RECOVERED;