Commit 7501a02a authored by Wesley Sheng's avatar Wesley Sheng Committed by Bjorn Helgaas
Browse files

PCI/switchtec: Remove redundant valid PFF number count 

Remove the redundant valid PFF number count from ioctl_event_summary(),
since init_pff() has already counted the valid PFFs.

Link: https://lore.kernel.org/r/20200106190337.2428-5-logang@deltatee.com


Signed-off-by: default avatarWesley Sheng <wesley.sheng@microchip.com>
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent a6b0ef9a

drivers/pci/switch/switchtec.c

+4 −8
Original line number Diff line number Diff line
@@ -683,11 +683,7 @@ static int ioctl_event_summary(struct switchtec_dev *stdev, 
		s->part[i] = reg;

	}



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

		reg = ioread16(&stdev->mmio_pff_csr[i].vendor_id);

		if (reg != PCI_VENDOR_ID_MICROSEMI)

			break;



	for (i = 0; i < stdev->pff_csr_count; i++) {

		reg = ioread32(&stdev->mmio_pff_csr[i].pff_event_summary);

		s->pff[i] = reg;

	}
@@ -1327,16 +1323,16 @@ static void init_pff(struct switchtec_dev *stdev) 
	stdev->pff_csr_count = i;



	reg = ioread32(&pcfg->usp_pff_inst_id);

	if (reg < SWITCHTEC_MAX_PFF_CSR)

	if (reg < stdev->pff_csr_count)

		stdev->pff_local[reg] = 1;



	reg = ioread32(&pcfg->vep_pff_inst_id);

	if (reg < SWITCHTEC_MAX_PFF_CSR)

	if (reg < stdev->pff_csr_count)

		stdev->pff_local[reg] = 1;



	for (i = 0; i < ARRAY_SIZE(pcfg->dsp_pff_inst_id); i++) {

		reg = ioread32(&pcfg->dsp_pff_inst_id[i]);

		if (reg < SWITCHTEC_MAX_PFF_CSR)

		if (reg < stdev->pff_csr_count)

			stdev->pff_local[reg] = 1;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE