Commit b94ec12d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Refactor infinite loop in pcie_poll_cmd() 

Infinite timeout loops are hard to read. Refactor it to plausible 'do {}
while ()'.

Note, the supplied timeout can't be negative for current use, though if
it's not dividable to 10, we may go below 0, that's why type of the
parameter is int. And thus, we may move the check to the loop condition.

No functional change intended.

Link: https://lore.kernel.org/r/20191108111855.85866-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndrew Murray <andrew.murray@arm.com>
parent 157c1062

drivers/pci/hotplug/pciehp_hpc.c

+2 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int pcie_poll_cmd(struct controller *ctrl, int timeout) 
	struct pci_dev *pdev = ctrl_dev(ctrl);

	u16 slot_status;



	while (true) {

	do {

		pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);

		if (slot_status == (u16) ~0) {

			ctrl_info(ctrl, "%s: no response from device\n",
@@ -81,11 +81,9 @@ static int pcie_poll_cmd(struct controller *ctrl, int timeout) 
						   PCI_EXP_SLTSTA_CC);

			return 1;

		}

		if (timeout < 0)

			break;

		msleep(10);

		timeout -= 10;

	}

	} while (timeout >= 0);

	return 0;	/* timeout */

}