[RFC 06/12] PCI: Convert vfio_pci_core.c to pci_is_sriov_* helpers

[Dimitri Daskalakis]

From: Dimitri Daskalakis <dask...@meta.com>

No functional changes.

Assisted-by: Claude:claude-opus-4.7
Signed-off-by: Dimitri Daskalakis <dask...@meta.com>
---
 drivers/vfio/pci/vfio_pci_core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index 3f8d093aacf8..ad8069612cb2 100644
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -1856,7 +1856,7 @@ int vfio_pci_core_match_token_uuid(struct vfio_device 
*core_vdev,
         *
         * If the VF token is provided but unused, an error is generated.
         */
-       if (vdev->pdev->is_virtfn) {
+       if (pci_is_sriov_virtfn(vdev->pdev)) {
                struct vfio_pci_core_device *pf_vdev = vdev->sriov_pf_core_dev;
                bool match;
 
@@ -1979,13 +1979,13 @@ static int vfio_pci_bus_notifier(struct notifier_block 
*nb,
        struct pci_dev *physfn = pci_physfn(pdev);
 
        if (action == BUS_NOTIFY_ADD_DEVICE &&
-           pdev->is_virtfn && physfn == vdev->pdev) {
+           pci_is_sriov_virtfn(pdev) && physfn == vdev->pdev) {
                pci_info(vdev->pdev, "Captured SR-IOV VF %s driver_override\n",
                         pci_name(pdev));
                WARN_ON(device_set_driver_override(&pdev->dev,
                                                   vdev->vdev.ops->name));
        } else if (action == BUS_NOTIFY_BOUND_DRIVER &&
-                  pdev->is_virtfn && physfn == vdev->pdev) {
+                  pci_is_sriov_virtfn(pdev) && physfn == vdev->pdev) {
                struct pci_driver *drv = pci_dev_driver(pdev);
 
                if (drv && drv != pci_dev_driver(vdev->pdev))
@@ -2005,7 +2005,7 @@ static int vfio_pci_vf_init(struct vfio_pci_core_device 
*vdev)
        struct pci_dev *physfn;
        int ret;
 
-       if (pdev->is_virtfn) {
+       if (pci_is_sriov_virtfn(pdev)) {
                /*
                 * If this VF was created by our vfio_pci_core_sriov_configure()
                 * then we can find the PF vfio_pci_core_device now, and due to
@@ -2025,7 +2025,7 @@ static int vfio_pci_vf_init(struct vfio_pci_core_device 
*vdev)
        }
 
        /* Not a SRIOV PF */
-       if (!pdev->is_physfn)
+       if (!pci_is_sriov_physfn(pdev))
                return 0;
 
        vdev->vf_token = kzalloc_obj(*vdev->vf_token);
@@ -2166,7 +2166,7 @@ int vfio_pci_core_register_device(struct 
vfio_pci_core_device *vdev)
                return -EBUSY;
        }
 
-       if (pci_is_root_bus(pdev->bus) || pdev->is_virtfn) {
+       if (pci_is_root_bus(pdev->bus) || pci_is_sriov_virtfn(pdev)) {
                ret = vfio_assign_device_set(&vdev->vdev, vdev);
        } else if (!pci_probe_reset_slot(pdev->slot)) {
                ret = vfio_assign_device_set(&vdev->vdev, pdev->slot);
-- 
2.52.0