8 files changed, 74 insertions, 80 deletions
diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index 62210116..e54c8c61 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -513,17 +513,15 @@ static const struct command_registration armjtagew_command_handlers[] = {
 };
 
 struct jtag_interface armjtagew_interface = {
-		.name = "arm-jtag-ew",
-
-		.commands = armjtagew_command_handlers,
-
-		.execute_queue = &armjtagew_execute_queue,
-		.speed = &armjtagew_speed,
-		.khz = &armjtagew_khz,
-
-		.init = &armjtagew_init,
-		.quit = &armjtagew_quit,
-	};
+	.name = "arm-jtag-ew",
+	.commands = armjtagew_command_handlers,
+
+	.execute_queue = armjtagew_execute_queue,
+	.speed = armjtagew_speed,
+	.khz = armjtagew_khz,
+	.init = armjtagew_init,
+	.quit = armjtagew_quit,
+};
 
 /***************************************************************************/
 /* ARM-JTAG-EW tap functions */
diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 06fc2523..a3ac142b 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -4018,12 +4018,13 @@ static const struct command_registration ft2232_command_handlers[] = {
 };
 
 struct jtag_interface ft2232_interface = {
-		.name = "ft2232",
-		.commands = ft2232_command_handlers,
-		.init = &ft2232_init,
-		.quit = &ft2232_quit,
-		.speed = &ft2232_speed,
-		.speed_div = &ft2232_speed_div,
-		.khz = &ft2232_khz,
-		.execute_queue = &ft2232_execute_queue,
-	};
+	.name = "ft2232",
+	.commands = ft2232_command_handlers,
+
+	.init = ft2232_init,
+	.quit = ft2232_quit,
+	.speed = ft2232_speed,
+	.speed_div = ft2232_speed_div,
+	.khz = ft2232_khz,
+	.execute_queue = ft2232_execute_queue,
+};
diff --git a/src/jtag/drivers/gw16012.c b/src/jtag/drivers/gw16012.c
index 9083e925..38e5dd72 100644
--- a/src/jtag/drivers/gw16012.c
+++ b/src/jtag/drivers/gw16012.c
@@ -574,10 +574,11 @@ static const struct command_registration gw16012_command_handlers[] = {
 };
 
 struct jtag_interface gw16012_interface = {
-		.name = "gw16012",
-		.commands = gw16012_command_handlers,
-		.init = &gw16012_init,
-		.quit = &gw16012_quit,
-		.speed = &gw16012_speed,
-		.execute_queue = &gw16012_execute_queue,
-	};
+	.name = "gw16012",
+	.commands = gw16012_command_handlers,
+
+	.init = gw16012_init,
+	.quit = gw16012_quit,
+	.speed = gw16012_speed,
+	.execute_queue = gw16012_execute_queue,
+};
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 4ca43490..6596849e 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -645,18 +645,16 @@ static const struct command_registration jlink_command_handlers[] = {
 };
 
 struct jtag_interface jlink_interface = {
-		.name = "jlink",
-
-		.commands = jlink_command_handlers,
-
-		.execute_queue = &jlink_execute_queue,
-		.speed = &jlink_speed,
-		.speed_div = &jlink_speed_div,
-		.khz = &jlink_khz,
-
-		.init = &jlink_init,
-		.quit = &jlink_quit,
-	};
+	.name = "jlink",
+	.commands = jlink_command_handlers,
+
+	.execute_queue = jlink_execute_queue,
+	.speed = jlink_speed,
+	.speed_div = jlink_speed_div,
+	.khz = jlink_khz,
+	.init = jlink_init,
+	.quit = jlink_quit,
+};
 
 /***************************************************************************/
 /* J-Link tap functions */
diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c
index 04ac2728..2e6b9ed5 100644
--- a/src/jtag/drivers/parport.c
+++ b/src/jtag/drivers/parport.c
@@ -517,16 +517,13 @@ static const struct command_registration parport_command_handlers[] = {
 };
 
 struct jtag_interface parport_interface = {
-		.name = "parport",
-
-		.commands = parport_command_handlers,
-
-		.init = &parport_init,
-		.quit = &parport_quit,
-
-		.khz = &parport_khz,
-		.speed_div = &parport_speed_div,
-		.speed = &parport_speed,
-
-		.execute_queue = &bitbang_execute_queue,
-	};
+	.name = "parport",
+	.commands = parport_command_handlers,
+
+	.init = parport_init,
+	.quit = parport_quit,
+	.khz = parport_khz,
+	.speed_div = parport_speed_div,
+	.speed = parport_speed,
+	.execute_queue = bitbang_execute_queue,
+};
diff --git a/src/jtag/drivers/presto.c b/src/jtag/drivers/presto.c
index fac5e823..0baf561e 100644
--- a/src/jtag/drivers/presto.c
+++ b/src/jtag/drivers/presto.c
@@ -786,15 +786,13 @@ static int presto_jtag_quit(void)
 }
 
 struct jtag_interface presto_interface = {
-		.name = "presto",
-
-		.commands = presto_command_handlers,
-
-		.execute_queue = &bitq_execute_queue,
-		.speed = &presto_jtag_speed,
-		.khz = &presto_jtag_khz,
-		.speed_div = &presto_jtag_speed_div,
-
-		.init = &presto_jtag_init,
-		.quit = &presto_jtag_quit,
-	};
+	.name = "presto",
+	.commands = presto_command_handlers,
+
+	.execute_queue = bitq_execute_queue,
+	.speed = presto_jtag_speed,
+	.khz = presto_jtag_khz,
+	.speed_div = presto_jtag_speed_div,
+	.init = presto_jtag_init,
+	.quit = presto_jtag_quit,
+};
diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index f6d8a972..0d51b27f 100644
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -652,9 +652,10 @@ static void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag)
 }
 
 struct jtag_interface usbprog_interface = {
-		.name = "usbprog",
-		.execute_queue = &usbprog_execute_queue,
-		.speed = &usbprog_speed,
-		.init = &usbprog_init,
-		.quit = &usbprog_quit
-	};
+	.name = "usbprog",
+
+	.execute_queue = usbprog_execute_queue,
+	.speed = usbprog_speed,
+	.init = usbprog_init,
+	.quit = usbprog_quit
+};
diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index bbbb5f94..d3012906 100644
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -1891,13 +1891,13 @@ static const struct command_registration vsllink_command_handlers[] = {
 };
 
 struct jtag_interface vsllink_interface = {
-		.name = "vsllink",
-		.commands = vsllink_command_handlers,
-
-		.init = &vsllink_init,
-		.quit = &vsllink_quit,
-		.khz = &vsllink_khz,
-		.speed = &vsllink_speed,
-		.speed_div = &vsllink_speed_div,
-		.execute_queue = &vsllink_execute_queue,
-	};
+	.name = "vsllink",
+	.commands = vsllink_command_handlers,
+
+	.init = vsllink_init,
+	.quit = vsllink_quit,
+	.khz = vsllink_khz,
+	.speed = vsllink_speed,
+	.speed_div = vsllink_speed_div,
+	.execute_queue = vsllink_execute_queue,
+};