PCI/IOV: Use pci_dev_id() to simplify the code

When we have a struct pci_dev *, use pci_dev_id() instead of manually
composing the ID with PCI_DEVID() from dev->bus->number and dev->devfn.

[bhelgaas: commit log]
Link: https://lore.kernel.org/r/20230807134858.116051-4-wangxiongfeng2@huawei.com
Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index b2e8322755c173c9c3f983933d99e3014cfd932d..25dbe85c4217585505510aeb19cadb7f7f491bdb 100644 (file)
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -41,8 +41,7 @@ int pci_iov_vf_id(struct pci_dev *dev)
                return -EINVAL;
 
        pf = pci_physfn(dev);
-       return (((dev->bus->number << 8) + dev->devfn) -
-               ((pf->bus->number << 8) + pf->devfn + pf->sriov->offset)) /
+       return (pci_dev_id(dev) - (pci_dev_id(pf) + pf->sriov->offset)) /
               pf->sriov->stride;
 }
 EXPORT_SYMBOL_GPL(pci_iov_vf_id);