1 files changed, 3 insertions, 13 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
index 5ebb3f43feb6..3ab4c65ecc8b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
@@ -119,8 +119,6 @@ int amdgpu_ih_ring_init(struct amdgpu_device *adev, unsigned ring_size,
  */
 void amdgpu_ih_ring_fini(struct amdgpu_device *adev)
 {
-        int r;
-
         if (adev->irq.ih.use_bus_addr) {
                 if (adev->irq.ih.ring) {
                         /* add 8 bytes for the rptr/wptr shadows and
@@ -132,17 +130,9 @@ void amdgpu_ih_ring_fini(struct amdgpu_device *adev)
                         adev->irq.ih.ring = NULL;
                 }
         } else {
-                if (adev->irq.ih.ring_obj) {
-                        r = amdgpu_bo_reserve(adev->irq.ih.ring_obj, false);
-                        if (likely(r == 0)) {
-                                amdgpu_bo_kunmap(adev->irq.ih.ring_obj);
-                                amdgpu_bo_unpin(adev->irq.ih.ring_obj);
-                                amdgpu_bo_unreserve(adev->irq.ih.ring_obj);
-                        }
-                        amdgpu_bo_unref(&adev->irq.ih.ring_obj);
-                        adev->irq.ih.ring = NULL;
-                        adev->irq.ih.ring_obj = NULL;
-                }
+                amdgpu_bo_free_kernel(&adev->irq.ih.ring_obj,
+                                      &adev->irq.ih.gpu_addr,
+                                      (void **)&adev->irq.ih.ring);
                 amdgpu_wb_free(adev, adev->irq.ih.wptr_offs);
                 amdgpu_wb_free(adev, adev->irq.ih.rptr_offs);
         }