Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39098edb authored by Denis Efremov's avatar Denis Efremov Committed by Bjorn Helgaas
Browse files

PCI: Use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END 

Writing loop conditions as "i < NUM" is a common C idiom; using "i <= END"
is unusual and thus prone to errors.  Change loops to use the former.

Link: https://lore.kernel.org/r/20190806140715.19847-1-efremov@linux.com


Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
parent b8074aa2

drivers/pci/iov.c

+2 −2
Original line number Diff line number Diff line
@@ -557,8 +557,8 @@ static void sriov_restore_state(struct pci_dev *dev) 
	ctrl |= iov->ctrl & PCI_SRIOV_CTRL_ARI;

	pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, ctrl);



	for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++)

		pci_update_resource(dev, i);

	for (i = 0; i < PCI_SRIOV_NUM_BARS; i++)

		pci_update_resource(dev, i + PCI_IOV_RESOURCES);



	pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz);

	pci_iov_set_numvfs(dev, iov->num_VFs);

drivers/pci/setup-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -1662,8 +1662,8 @@ static int iov_resources_unassigned(struct pci_dev *dev, void *data) 
	int i;

	bool *unassigned = data;



	for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++) {

		struct resource *r = &dev->resource[i];

	for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {

		struct resource *r = &dev->resource[i + PCI_IOV_RESOURCES];

		struct pci_bus_region region;



		/* Not assigned or rejected by kernel? */