PCI/ERR: Combine pci_channel_io_frozen cases (b5dfbeac) · Commits · 戴 / test

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:

drivers/pci/pcie/err.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -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
		pci_walk_bus(bus, report_normal_detected, &status);

		if (state == pci_channel_io_frozen &&
		reset_link(dev, service) != PCI_ERS_RESULT_RECOVERED)
		if (reset_link(dev, service) != PCI_ERS_RESULT_RECOVERED)
		goto failed;
		} else {
		pci_walk_bus(bus, report_normal_detected, &status);
		}

		if (status == PCI_ERS_RESULT_CAN_RECOVER) {
		status = PCI_ERS_RESULT_RECOVERED;