diff mbox series

drm: manager: Remove the unused variable prev

Message ID 20230809065229.71300-1-jiapeng.chong@linux.alibaba.com (mailing list archive)
State New, archived
Headers show
Series drm: manager: Remove the unused variable prev | expand

Commit Message

Jiapeng Chong Aug. 9, 2023, 6:52 a.m. UTC 
Variable prev is not effectively used, so delete it.

drivers/gpu/drm/drm_gpuva_mgr.c:1079:32: warning: variable ‘prev’ set but not used.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 drivers/gpu/drm/drm_gpuva_mgr.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

kernel test robot Aug. 9, 2023, 1:16 p.m. UTC | #1 
Hi Jiapeng,

kernel test robot noticed the following build warnings:

[auto build test WARNING on drm-misc/drm-misc-next]
[also build test WARNING on next-20230809]
[cannot apply to linus/master v6.5-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Jiapeng-Chong/drm-manager-Remove-the-unused-variable-prev/20230809-145348
base:   git://anongit.freedesktop.org/drm/drm-misc drm-misc-next
patch link:    https://lore.kernel.org/r/20230809065229.71300-1-jiapeng.chong%40linux.alibaba.com
patch subject: [PATCH] drm: manager: Remove the unused variable prev
config: riscv-randconfig-r042-20230809 (https://download.01.org/0day-ci/archive/20230809/202308092135.95Kg6wDq-lkp@intel.com/config)
compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07)
reproduce: (https://download.01.org/0day-ci/archive/20230809/202308092135.95Kg6wDq-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202308092135.95Kg6wDq-lkp@intel.com/

All warnings (new ones prefixed by >>):

>> drivers/gpu/drm/drm_gpuva_mgr.c:1209:2: warning: label at end of compound statement is a C2x extension [-Wc2x-extensions]
           }
           ^
   1 warning generated.


vim +1209 drivers/gpu/drm/drm_gpuva_mgr.c

e6303f323b1ad9 Danilo Krummrich 2023-07-20  1072  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1073  static int
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1074  __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1075  		   const struct drm_gpuva_fn_ops *ops, void *priv,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1076  		   u64 req_addr, u64 req_range,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1077  		   struct drm_gem_object *req_obj, u64 req_offset)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1078  {
e927727c10be76 Jiapeng Chong    2023-08-09  1079  	struct drm_gpuva *va, *next = NULL;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1080  	u64 req_end = req_addr + req_range;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1081  	int ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1082  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1083  	if (unlikely(!drm_gpuva_range_valid(mgr, req_addr, req_range)))
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1084  		return -EINVAL;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1085  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1086  	drm_gpuva_for_each_va_range_safe(va, next, mgr, req_addr, req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1087  		struct drm_gem_object *obj = va->gem.obj;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1088  		u64 offset = va->gem.offset;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1089  		u64 addr = va->va.addr;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1090  		u64 range = va->va.range;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1091  		u64 end = addr + range;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1092  		bool merge = !!va->gem.obj;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1093  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1094  		if (addr == req_addr) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1095  			merge &= obj == req_obj &&
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1096  				 offset == req_offset;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1097  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1098  			if (end == req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1099  				ret = op_unmap_cb(ops, priv, va, merge);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1100  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1101  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1102  				break;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1103  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1104  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1105  			if (end < req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1106  				ret = op_unmap_cb(ops, priv, va, merge);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1107  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1108  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1109  				goto next;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1110  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1111  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1112  			if (end > req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1113  				struct drm_gpuva_op_map n = {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1114  					.va.addr = req_end,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1115  					.va.range = range - req_range,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1116  					.gem.obj = obj,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1117  					.gem.offset = offset + req_range,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1118  				};
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1119  				struct drm_gpuva_op_unmap u = {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1120  					.va = va,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1121  					.keep = merge,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1122  				};
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1123  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1124  				ret = op_remap_cb(ops, priv, NULL, &n, &u);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1125  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1126  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1127  				break;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1128  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1129  		} else if (addr < req_addr) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1130  			u64 ls_range = req_addr - addr;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1131  			struct drm_gpuva_op_map p = {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1132  				.va.addr = addr,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1133  				.va.range = ls_range,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1134  				.gem.obj = obj,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1135  				.gem.offset = offset,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1136  			};
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1137  			struct drm_gpuva_op_unmap u = { .va = va };
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1138  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1139  			merge &= obj == req_obj &&
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1140  				 offset + ls_range == req_offset;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1141  			u.keep = merge;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1142  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1143  			if (end == req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1144  				ret = op_remap_cb(ops, priv, &p, NULL, &u);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1145  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1146  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1147  				break;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1148  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1149  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1150  			if (end < req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1151  				ret = op_remap_cb(ops, priv, &p, NULL, &u);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1152  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1153  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1154  				goto next;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1155  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1156  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1157  			if (end > req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1158  				struct drm_gpuva_op_map n = {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1159  					.va.addr = req_end,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1160  					.va.range = end - req_end,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1161  					.gem.obj = obj,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1162  					.gem.offset = offset + ls_range +
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1163  						      req_range,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1164  				};
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1165  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1166  				ret = op_remap_cb(ops, priv, &p, &n, &u);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1167  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1168  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1169  				break;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1170  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1171  		} else if (addr > req_addr) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1172  			merge &= obj == req_obj &&
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1173  				 offset == req_offset +
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1174  					   (addr - req_addr);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1175  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1176  			if (end == req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1177  				ret = op_unmap_cb(ops, priv, va, merge);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1178  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1179  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1180  				break;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1181  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1182  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1183  			if (end < req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1184  				ret = op_unmap_cb(ops, priv, va, merge);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1185  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1186  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1187  				goto next;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1188  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1189  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1190  			if (end > req_end) {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1191  				struct drm_gpuva_op_map n = {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1192  					.va.addr = req_end,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1193  					.va.range = end - req_end,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1194  					.gem.obj = obj,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1195  					.gem.offset = offset + req_end - addr,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1196  				};
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1197  				struct drm_gpuva_op_unmap u = {
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1198  					.va = va,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1199  					.keep = merge,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1200  				};
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1201  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1202  				ret = op_remap_cb(ops, priv, NULL, &n, &u);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1203  				if (ret)
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1204  					return ret;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1205  				break;
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1206  			}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1207  		}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1208  next:
e6303f323b1ad9 Danilo Krummrich 2023-07-20 @1209  	}
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1210  
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1211  	return op_map_cb(ops, priv,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1212  			 req_addr, req_range,
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1213  			 req_obj, req_offset);
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1214  }
e6303f323b1ad9 Danilo Krummrich 2023-07-20  1215
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_gpuva_mgr.c b/drivers/gpu/drm/drm_gpuva_mgr.c
index f86bfad74ff8..afa5330445b3 100644
--- 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 = NULL;
 	u64 req_end = req_addr + req_range;
 	int ret;
 
@@ -1206,7 +1206,6 @@  __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
 			}
 		}
 next:
-		prev = va;
 	}
 
 	return op_map_cb(ops, priv,