diff options
| author |   Luis Chamberlain <mcgrof@kernel.org> | 2021-06-22 19:28:24 -0700 |
|---|---|---|
| committer |   Alex Williamson <alex.williamson@redhat.com> | 2021-06-24 13:32:31 -0600 |
| commit | 742b4c0d1efe7a7640ad17f1bbf696a1305f6495 (patch) | |
| tree | 11480ebc75a5216f7ad3ecad2793f6f759240c58 /drivers/vfio | |
| parent | PCI: Export pci_dev_trylock() and pci_dev_unlock() (diff) | |
| download | linux-dev-742b4c0d1efe7a7640ad17f1bbf696a1305f6495.tar.xz linux-dev-742b4c0d1efe7a7640ad17f1bbf696a1305f6495.zip | |
vfio: use the new pci_dev_trylock() helper to simplify try lock
Use the new pci_dev_trylock() helper to simplify our locking.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20210623022824.308041-3-mcgrof@kernel.org
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index f6729baa1bf4..759dfb118712 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -477,13 +477,10 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev) * We can not use the "try" reset interface here, which will * overwrite the previously restored configuration information. */ - if (vdev->reset_works && pci_cfg_access_trylock(pdev)) { - if (device_trylock(&pdev->dev)) { - if (!__pci_reset_function_locked(pdev)) - vdev->needs_reset = false; - device_unlock(&pdev->dev); - } - pci_cfg_access_unlock(pdev); + if (vdev->reset_works && pci_dev_trylock(pdev)) { + if (!__pci_reset_function_locked(pdev)) + vdev->needs_reset = false; + pci_dev_unlock(pdev); } pci_restore_state(pdev); |