Commit fe8aa8e3 authored by Xiongfeng Wang's avatar Xiongfeng Wang Committed by Michael Ellerman
Browse files

powerpc/powernv/pci: use pci_dev_id() to simplify the code 



PCI core API pci_dev_id() can be used to get the BDF number for a pci
device. We don't need to compose it mannually. Use pci_dev_id() to
simplify the code a little bit.

Signed-off-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarFrederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230804080435.191196-1-wangxiongfeng2@huawei.com
parent 984b07b4

arch/powerpc/platforms/powernv/pci-ioda.c

+3 −3
Original line number Diff line number Diff line
@@ -997,14 +997,14 @@ static void pnv_pci_ioda_dma_dev_setup(struct pci_dev *pdev) 
	struct pnv_ioda_pe *pe;



	/* Check if the BDFN for this device is associated with a PE yet */

	pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8));

	pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev));

	if (!pe) {

		/* VF PEs should be pre-configured in pnv_pci_sriov_enable() */

		if (WARN_ON(pdev->is_virtfn))

			return;



		pnv_pci_configure_bus(pdev->bus);

		pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8));

		pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev));

		pci_info(pdev, "Configured PE#%x\n", pe ? pe->pe_number : 0xfffff);
@@ -2526,7 +2526,7 @@ static struct iommu_group *pnv_pci_device_group(struct pci_controller *hose, 
	if (WARN_ON(!phb))

		return ERR_PTR(-ENODEV);



	pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8));

	pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev));

	if (!pe)

		return ERR_PTR(-ENODEV);