diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c
index 289737754..ee1cb533c 100644
--- a/src/jtag/drivers/cmsis_dap_usb.c
+++ b/src/jtag/drivers/cmsis_dap_usb.c
@@ -364,8 +364,6 @@ static void cmsis_dap_usb_close(struct cmsis_dap *dap)
 		free(pending_fifo[i].transfers);
 		pending_fifo[i].transfers = NULL;
 	}
-
-	return;
 }
 
 static int cmsis_dap_usb_write(struct cmsis_dap *dap, int txlen)
diff --git a/src/jtag/drivers/sysfsgpio.c b/src/jtag/drivers/sysfsgpio.c
index e4a15237b..a4d7ad9ec 100644
--- a/src/jtag/drivers/sysfsgpio.c
+++ b/src/jtag/drivers/sysfsgpio.c
@@ -98,8 +98,6 @@ static void unexport_sysfs_gpio(int gpio)
 	snprintf(gpiostr, sizeof(gpiostr), "%d", gpio);
 	if (open_write_close("/sys/class/gpio/unexport", gpiostr) < 0)
 		LOG_ERROR("Couldn't unexport gpio %d", gpio);
-
-	return;
 }
 
 /*
diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c
index 8a832adf0..5e4df93c2 100644
--- a/src/jtag/drivers/xds110.c
+++ b/src/jtag/drivers/xds110.c
@@ -1683,14 +1683,11 @@ static int xds110_reset(int trst, int srst)
 static void xds110_execute_sleep(struct jtag_command *cmd)
 {
 	jtag_sleep(cmd->cmd.sleep->us);
-	return;
 }
 
 static void xds110_execute_tlr_reset(struct jtag_command *cmd)
 {
 	(void)xds_goto_state(XDS_JTAG_STATE_RESET);
-
-	return;
 }
 
 static void xds110_execute_pathmove(struct jtag_command *cmd)
@@ -1726,8 +1723,6 @@ static void xds110_execute_pathmove(struct jtag_command *cmd)
 	}
 
 	free((void *)path);
-
-	return;
 }
 
 static void xds110_queue_scan(struct jtag_command *cmd)
@@ -1799,8 +1794,6 @@ static void xds110_queue_scan(struct jtag_command *cmd)
 	}
 	xds110.txn_request_size += total_bytes;
 	xds110.txn_result_size += total_bytes;
-
-	return;
 }
 
 static void xds110_queue_runtest(struct jtag_command *cmd)
@@ -1820,8 +1813,6 @@ static void xds110_queue_runtest(struct jtag_command *cmd)
 	xds110.txn_requests[xds110.txn_request_size++] = (clocks >> 16) & 0xff;
 	xds110.txn_requests[xds110.txn_request_size++] = (clocks >> 24) & 0xff;
 	xds110.txn_requests[xds110.txn_request_size++] = end_state;
-
-	return;
 }
 
 static void xds110_queue_stableclocks(struct jtag_command *cmd)
@@ -1838,8 +1829,6 @@ static void xds110_queue_stableclocks(struct jtag_command *cmd)
 	xds110.txn_requests[xds110.txn_request_size++] = (clocks >>  8) & 0xff;
 	xds110.txn_requests[xds110.txn_request_size++] = (clocks >> 16) & 0xff;
 	xds110.txn_requests[xds110.txn_request_size++] = (clocks >> 24) & 0xff;
-
-	return;
 }
 
 static void xds110_execute_command(struct jtag_command *cmd)