On Wed, Apr 24, 2019 at 09:16:10PM +0200, Heiner Kallweit wrote: > Use new helper pci_dev_id() to simplify the code. > > Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx> Reviewed-by: Joerg Roedel <jroedel@xxxxxxx> > --- > drivers/iommu/intel-iommu.c | 2 +- > drivers/iommu/intel_irq_remapping.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index d93c4bd7d..3f475a23a 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -1391,7 +1391,7 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info) > > /* pdev will be returned if device is not a vf */ > pf_pdev = pci_physfn(pdev); > - info->pfsid = PCI_DEVID(pf_pdev->bus->number, pf_pdev->devfn); > + info->pfsid = pci_dev_id(pf_pdev); > } > > #ifdef CONFIG_INTEL_IOMMU_SVM > diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c > index 634d8f059..4160aa9f3 100644 > --- a/drivers/iommu/intel_irq_remapping.c > +++ b/drivers/iommu/intel_irq_remapping.c > @@ -424,7 +424,7 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev) > set_irte_sid(irte, SVT_VERIFY_SID_SQ, SQ_ALL_16, data.alias); > else > set_irte_sid(irte, SVT_VERIFY_SID_SQ, SQ_ALL_16, > - PCI_DEVID(dev->bus->number, dev->devfn)); > + pci_dev_id(dev)); > > return 0; > } > -- > 2.21.0 >
