diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-08-15 15:01:26 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-08-15 15:01:26 +0200 |
| commit | a35762dd14adb952442e487d8dad4bb50b614b2b (patch) | |
| tree | 4d21de11837f293860db8abbea8db161f1018edb /drivers/iommu/iommufd/device.c | |
| parent | iommufd/selftest: Make the mock iommu driver into a real driver (diff) | |
| parent | Linux 6.5-rc6 (diff) | |
| download | linux-a35762dd14adb952442e487d8dad4bb50b614b2b.tar.xz linux-a35762dd14adb952442e487d8dad4bb50b614b2b.zip | |
Merge tag 'v6.5-rc6' into iommufd for-next
Required for following patches.
Resolve merge conflict by using the hunk from the for-next branch and
shifting the iommufd_object_deref_user() into iommufd_hw_pagetable_put()
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/iommu/iommufd/device.c')
| -rw-r--r-- | drivers/iommu/iommufd/device.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c index 4c37eeea2bcd..90f88c295ce0 100644 --- a/drivers/iommu/iommufd/device.c +++ b/drivers/iommu/iommufd/device.c @@ -275,10 +275,7 @@ EXPORT_SYMBOL_NS_GPL(iommufd_ctx_has_group, IOMMUFD); */ void iommufd_device_unbind(struct iommufd_device *idev) { - bool was_destroyed; - - was_destroyed = iommufd_object_destroy_user(idev->ictx, &idev->obj); - WARN_ON(!was_destroyed); + iommufd_object_destroy_user(idev->ictx, &idev->obj); } EXPORT_SYMBOL_NS_GPL(iommufd_device_unbind, IOMMUFD); @@ -814,10 +811,7 @@ EXPORT_SYMBOL_NS_GPL(iommufd_access_create, IOMMUFD); */ void iommufd_access_destroy(struct iommufd_access *access) { - bool was_destroyed; - - was_destroyed = iommufd_object_destroy_user(access->ictx, &access->obj); - WARN_ON(!was_destroyed); + iommufd_object_destroy_user(access->ictx, &access->obj); } EXPORT_SYMBOL_NS_GPL(iommufd_access_destroy, IOMMUFD); |