Jason Yan
2020-Aug-27  13:00 UTC
[Nouveau] [PATCH] drm/nouveau/svm: remove set but not used 'ret'
This addresses the following gcc warning with "make W=1":
drivers/gpu/drm/nouveau/nouveau_svm.c: In function ?nouveau_pfns_map?:
drivers/gpu/drm/nouveau/nouveau_svm.c:818:6: warning: variable ?ret? set
but not used [-Wunused-but-set-variable]
  818 |  int ret;
      |      ^~~
Reported-by: Hulk Robot <hulkci at huawei.com>
Signed-off-by: Jason Yan <yanaijie at huawei.com>
---
 drivers/gpu/drm/nouveau/nouveau_svm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c
b/drivers/gpu/drm/nouveau/nouveau_svm.c
index 2df1c0460559..7c95ffcbd18f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -815,7 +815,6 @@ nouveau_pfns_map(struct nouveau_svmm *svmm, struct mm_struct
*mm,
 		 unsigned long addr, u64 *pfns, unsigned long npages)
 {
 	struct nouveau_pfnmap_args *args = nouveau_pfns_to_args(pfns);
-	int ret;
 
 	args->p.addr = addr;
 	args->p.size = npages << PAGE_SHIFT;
@@ -823,8 +822,8 @@ nouveau_pfns_map(struct nouveau_svmm *svmm, struct mm_struct
*mm,
 	mutex_lock(&svmm->mutex);
 
 	svmm->vmm->vmm.object.client->super = true;
-	ret = nvif_object_ioctl(&svmm->vmm->vmm.object, args, sizeof(*args)
+
-				npages * sizeof(args->p.phys[0]), NULL);
+	nvif_object_ioctl(&svmm->vmm->vmm.object, args, sizeof(*args) +
+			  npages * sizeof(args->p.phys[0]), NULL);
 	svmm->vmm->vmm.object.client->super = false;
 
 	mutex_unlock(&svmm->mutex);
-- 
2.25.4
Seemingly Similar Threads
- [PATCH] drm/nouveau/svm: remove unused ret variable
- [PATCH -next] gpu: nouveau: Remove set but not used variable
- [PATCH] nouveau/hmm: map pages after migration
- [PATCH v2] nouveau/hmm: map pages after migration
- [PATCH 2/6] drm/nouveau/svm: remove unused but set variables
