drm/gpuva_mgr: remove unused prev pointer in __drm_gpuva_sm_map()

The prev pointer in __drm_gpuva_sm_map() was used to implement automatic
merging of mappings. Since automatic merging did not make its way
upstream, remove this leftover.

Fixes: e6303f323b1a ("drm: manager to keep track of GPUs VA mappings")
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230823233119.2891-1-dakr@redhat.com

diff --git a/drivers/gpu/drm/drm_gpuva_mgr.c b/drivers/gpu/drm/drm_gpuva_mgr.c
index f86bfad74ff8a2aef4324ef72bbe6f18527f0dc4..ad99c9cfedac70a6378d3e1d92124420bb3bc8c3 100644 (file)
--- a/drivers/gpu/drm/drm_gpuva_mgr.c
+++ b/drivers/gpu/drm/drm_gpuva_mgr.c
@@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
                   u64 req_addr, u64 req_range,
                   struct drm_gem_object *req_obj, u64 req_offset)
 {
-       struct drm_gpuva *va, *next, *prev = NULL;
+       struct drm_gpuva *va, *next;
        u64 req_end = req_addr + req_range;
        int ret;
 
@@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
                                ret = op_unmap_cb(ops, priv, va, merge);
                                if (ret)
                                        return ret;
-                               goto next;
+                               continue;
                        }
 
                        if (end > req_end) {
@@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
                                ret = op_remap_cb(ops, priv, &p, NULL, &u);
                                if (ret)
                                        return ret;
-                               goto next;
+                               continue;
                        }
 
                        if (end > req_end) {
@@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
                                ret = op_unmap_cb(ops, priv, va, merge);
                                if (ret)
                                        return ret;
-                               goto next;
+                               continue;
                        }
 
                        if (end > req_end) {
@@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
                                break;
                        }
                }
-next:
-               prev = va;
        }
 
        return op_map_cb(ops, priv,