diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 96565d949..2a81b086d 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -242,10 +242,10 @@ int jtag_tap_count(void)
 	return jtag_num_taps;
 }
 
-int jtag_tap_count_enabled(void)
+unsigned jtag_tap_count_enabled(void)
 {
 	jtag_tap_t *t;
-	int n;
+	unsigned n;
 
 	n = 0;
 	t = jtag_all_taps();
@@ -1065,7 +1065,7 @@ static bool jtag_examine_chain_match_tap(const struct jtag_tap_s *tap)
 static int jtag_examine_chain(void)
 {
 	u8 idcode_buffer[JTAG_MAX_CHAIN_SIZE * 4];
-	int device_count = 0;
+	unsigned device_count = 0;
 
 	jtag_examine_chain_execute(idcode_buffer, JTAG_MAX_CHAIN_SIZE);
 
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 89b1de82f..809708dce 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -181,7 +181,7 @@ extern jtag_tap_t* jtag_tap_by_position(int n);
 extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name);
 extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
-extern int jtag_tap_count_enabled(void);
+extern unsigned jtag_tap_count_enabled(void);
 extern int jtag_tap_count(void);
 
 static __inline__ jtag_tap_t* jtag_tap_next_enabled(jtag_tap_t* p)