X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fftdi.c;h=5e7eae073fa4d3a405c85a8851b6c1c5470652e0;hb=4cb3c9fae2a6a6cb5cf2c664179edace22abf5f6;hp=f17cd9fd9b35e4dd77173a5a2462b296b1d0b558;hpb=08ee7bb982b16742f52cfdc6c649d82ffa2eb177;p=openocd.git

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index f17cd9fd9b..5e7eae073f 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -69,7 +69,7 @@
 #endif
 
 /* project specific includes */
-#include <jtag/drivers/jtag_usb_common.h>
+#include <jtag/adapter.h>
 #include <jtag/interface.h>
 #include <jtag/swd.h>
 #include <transport/transport.h>
@@ -150,11 +150,11 @@ static struct signal *create_signal(const char *name)
 		psig = &(*psig)->next;
 
 	*psig = calloc(1, sizeof(**psig));
-	if (*psig == NULL)
+	if (!*psig)
 		return NULL;
 
 	(*psig)->name = strdup(name);
-	if ((*psig)->name == NULL) {
+	if (!(*psig)->name) {
 		free(*psig);
 		*psig = NULL;
 	}
@@ -672,7 +672,7 @@ static int ftdi_initialize(void)
 
 	for (int i = 0; ftdi_vid[i] || ftdi_pid[i]; i++) {
 		mpsse_ctx = mpsse_open(&ftdi_vid[i], &ftdi_pid[i], ftdi_device_desc,
-				ftdi_serial, jtag_usb_get_location(), ftdi_channel);
+				ftdi_serial, adapter_usb_get_location(), ftdi_channel);
 		if (mpsse_ctx)
 			break;
 	}
@@ -1068,7 +1068,7 @@ static int ftdi_swd_init(void)
 	swd_cmd_queue_alloced = 10;
 	swd_cmd_queue = malloc(swd_cmd_queue_alloced * sizeof(*swd_cmd_queue));
 
-	return swd_cmd_queue != NULL ? ERROR_OK : ERROR_FAIL;
+	return swd_cmd_queue ? ERROR_OK : ERROR_FAIL;
 }
 
 static void ftdi_swd_swdio_en(bool enable)
@@ -1143,7 +1143,7 @@ static int ftdi_swd_run_queue(void)
 				goto skip;
 			}
 
-			if (swd_cmd_queue[i].dst != NULL)
+			if (swd_cmd_queue[i].dst)
 				*swd_cmd_queue[i].dst = data;
 		}
 	}