diff --git a/src/jtag/drivers/versaloon/versaloon.c b/src/jtag/drivers/versaloon/versaloon.c
index 6fea888ab..e564d8b46 100644
--- a/src/jtag/drivers/versaloon/versaloon.c
+++ b/src/jtag/drivers/versaloon/versaloon.c
@@ -124,7 +124,7 @@ void versaloon_free_want_pos(void)
 	}
 	versaloon_want_pos = NULL;
 
-	for (i = 0; i < dimof(versaloon_pending); i++) {
+	for (i = 0; i < ARRAY_SIZE(versaloon_pending); i++) {
 		tmp = versaloon_pending[i].pos;
 		while (tmp != NULL) {
 			free_tmp = tmp;
diff --git a/src/jtag/drivers/versaloon/versaloon_include.h b/src/jtag/drivers/versaloon/versaloon_include.h
index 4ca81d5e2..a954b48e3 100644
--- a/src/jtag/drivers/versaloon/versaloon_include.h
+++ b/src/jtag/drivers/versaloon/versaloon_include.h
@@ -27,7 +27,6 @@
 #define PARAM_CHECK							1
 
 #define sleep_ms(ms)						jtag_sleep((ms) * 1000)
-#define dimof(arr)							(sizeof(arr) / sizeof((arr)[0]))
 #define TO_STR(name)						#name
 
 #define RESULT								int