[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1232-g4f459660a

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  4f459660a9dab3877f6f27127e565dd2b49b4ec7 (commit)
       via  e66bb9d3121eef35c312997aacb401847249a5cb (commit)
       via  9b29cb58acbd14ed831d68fce4d6e6a1728f8caf (commit)
      from  5df5e89cf3caf02dc6f49a5d3c8aa8b1349a1dbf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f459660a9dab3877f6f27127e565dd2b49b4ec7
Author: Antonio Borneo <bor...@gm...>
Date:   Mon May 6 01:03:52 2019 +0200

    coding style: avoid unnecessary line continuations
    
    Line continuation, adding a backslash as last char of the line, is
    requested in multi-line macro definition, but is not necessary in
    the rest of C code.
    
    Remove it where present.
    
    Identified by checkpatch script from Linux kernel v5.1 using the
    command
    
            find src/ -type f -exec ./tools/scripts/checkpatch.pl \
            -q --types LINE_CONTINUATIONS -f {} \;
    
    Change-Id: Id0c69e93456731717a7b290b16580e9f8ae741bc
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5619
    Reviewed-by: Andreas Fritiofson <and...@gm...>
    Tested-by: jenkins

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 73884b786..50ab207c1 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -2895,7 +2895,7 @@ int cfi_probe(struct flash_bank *bank)
 		}
 		if (offset != (cfi_info->dev_size * bank->bus_width / bank->chip_width)) {
 			LOG_WARNING(
-				"CFI size is 0x%" PRIx32 ", but total sector size is 0x%" PRIx32 "", \
+				"CFI size is 0x%" PRIx32 ", but total sector size is 0x%" PRIx32 "",
 				(cfi_info->dev_size * bank->bus_width / bank->chip_width),
 				offset);
 		}
diff --git a/src/flash/nor/fespi.c b/src/flash/nor/fespi.c
index 5d8f810ad..90242b1ad 100644
--- a/src/flash/nor/fespi.c
+++ b/src/flash/nor/fespi.c
@@ -182,7 +182,7 @@ static int fespi_read_reg(struct flash_bank *bank, uint32_t *value, target_addr_
 }
 
 static int fespi_write_reg(struct flash_bank *bank, target_addr_t address, uint32_t value)
-{								\
+{
 	struct target *target = bank->target;
 	struct fespi_flash_bank *fespi_info = bank->driver_priv;
 
diff --git a/src/flash/nor/kinetis_ke.c b/src/flash/nor/kinetis_ke.c
index 27b6d3a83..cfc04928b 100644
--- a/src/flash/nor/kinetis_ke.c
+++ b/src/flash/nor/kinetis_ke.c
@@ -814,7 +814,7 @@ static int kinetis_ke_protect_check(struct flash_bank *bank)
 
 		kinfo->protection_size = 0;
 	} else {
-		LOG_WARNING("Flash protected. FPOPEN=%i FPLDIS=%i FPHDIS=%i FPLS=%i FPHS=%i", \
+		LOG_WARNING("Flash protected. FPOPEN=%i FPLDIS=%i FPHDIS=%i FPLS=%i FPHS=%i",
 					fpopen ? 1 : 0, fpldis ? 1 : 0, fphdis ? 1 : 0, fpls, fphs);
 
 		/* Retrieve which region is protected and how much */
diff --git a/src/flash/nor/lpcspifi.c b/src/flash/nor/lpcspifi.c
index 19d754b0f..04ac3bb4d 100644
--- a/src/flash/nor/lpcspifi.c
+++ b/src/flash/nor/lpcspifi.c
@@ -177,8 +177,8 @@ static int lpcspifi_set_hw_mode(struct flash_bank *bank)
 	retval = target_alloc_working_area(target, sizeof(spifi_init_code)
 		+ SPIFI_INIT_STACK_SIZE, &spifi_init_algorithm);
 	if (retval != ERROR_OK) {
-		LOG_ERROR("Insufficient working area to initialize SPIFI "\
-			"module. You must allocate at least %zdB of working "\
+		LOG_ERROR("Insufficient working area to initialize SPIFI "
+			"module. You must allocate at least %zdB of working "
 			"area in order to use this driver.",
 			sizeof(spifi_init_code) + SPIFI_INIT_STACK_SIZE
 		);
@@ -452,7 +452,7 @@ static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
 	 * it, use a bulk erase instead of going sector-by-sector. */
 	if (first == 0 && last == (bank->num_sectors - 1)
 		&& lpcspifi_info->dev->chip_erase_cmd != lpcspifi_info->dev->erase_cmd) {
-		LOG_DEBUG("Chip supports the bulk erase command."\
+		LOG_DEBUG("Chip supports the bulk erase command."
 		" Will use bulk erase instead of sector-by-sector erase.");
 		retval = lpcspifi_bulk_erase(bank);
 
@@ -525,7 +525,7 @@ static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
 	retval = target_alloc_working_area(target, sizeof(lpcspifi_flash_erase_code),
 		&erase_algorithm);
 	if (retval != ERROR_OK) {
-		LOG_ERROR("Insufficient working area. You must configure a working"\
+		LOG_ERROR("Insufficient working area. You must configure a working"
 			" area of at least %zdB in order to erase SPIFI flash.",
 			sizeof(lpcspifi_flash_erase_code));
 		return retval;
@@ -685,7 +685,7 @@ static int lpcspifi_write(struct flash_bank *bank, const uint8_t *buffer,
 
 	if (target_alloc_working_area(target, sizeof(lpcspifi_flash_write_code),
 			&write_algorithm) != ERROR_OK) {
-		LOG_ERROR("Insufficient working area. You must configure"\
+		LOG_ERROR("Insufficient working area. You must configure"
 			" a working area > %zdB in order to write to SPIFI flash.",
 			sizeof(lpcspifi_flash_write_code));
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -707,15 +707,15 @@ static int lpcspifi_write(struct flash_bank *bank, const uint8_t *buffer,
 		 * space, free the algorithm */
 		target_free_working_area(target, write_algorithm);
 
-		LOG_ERROR("Insufficient working area. Please allocate at least"\
+		LOG_ERROR("Insufficient working area. Please allocate at least"
 			" %zdB of working area to enable flash writes.",
 			sizeof(lpcspifi_flash_write_code) + 1
 		);
 
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	} else if (fifo_size < page_size)
-		LOG_WARNING("Working area size is limited; flash writes may be"\
-			" slow. Increase working area size to at least %zdB"\
+		LOG_WARNING("Working area size is limited; flash writes may be"
+			" slow. Increase working area size to at least %zdB"
 			" to reduce write times.",
 			(size_t)(sizeof(lpcspifi_flash_write_code) + page_size)
 		);
diff --git a/src/flash/nor/mrvlqspi.c b/src/flash/nor/mrvlqspi.c
index 803e84a91..7a06b3d09 100644
--- a/src/flash/nor/mrvlqspi.c
+++ b/src/flash/nor/mrvlqspi.c
@@ -563,7 +563,7 @@ static int mrvlqspi_flash_erase(struct flash_bank *bank, int first, int last)
 	if (first == 0 && last == (bank->num_sectors - 1)
 		&& mrvlqspi_info->dev->chip_erase_cmd !=
 					mrvlqspi_info->dev->erase_cmd) {
-		LOG_DEBUG("Chip supports the bulk erase command."\
+		LOG_DEBUG("Chip supports the bulk erase command."
 		" Will use bulk erase instead of sector-by-sector erase.");
 		retval = mrvlqspi_bulk_erase(bank);
 		if (retval == ERROR_OK) {
@@ -681,7 +681,7 @@ static int mrvlqspi_flash_write(struct flash_bank *bank, const uint8_t *buffer,
 
 	if (target_alloc_working_area(target, sizeof(mrvlqspi_flash_write_code),
 			&write_algorithm) != ERROR_OK) {
-		LOG_ERROR("Insufficient working area. You must configure"\
+		LOG_ERROR("Insufficient working area. You must configure"
 			" a working area > %zdB in order to write to SPIFI flash.",
 			sizeof(mrvlqspi_flash_write_code));
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -703,15 +703,15 @@ static int mrvlqspi_flash_write(struct flash_bank *bank, const uint8_t *buffer,
 		 * space, free the algorithm */
 		target_free_working_area(target, write_algorithm);
 
-		LOG_ERROR("Insufficient working area. Please allocate at least"\
+		LOG_ERROR("Insufficient working area. Please allocate at least"
 			" %zdB of working area to enable flash writes.",
 			sizeof(mrvlqspi_flash_write_code) + 1
 		);
 
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	} else if (fifo_size < page_size)
-		LOG_WARNING("Working area size is limited; flash writes may be"\
-			" slow. Increase working area size to at least %zdB"\
+		LOG_WARNING("Working area size is limited; flash writes may be"
+			" slow. Increase working area size to at least %zdB"
 			" to reduce write times.",
 			(size_t)(sizeof(mrvlqspi_flash_write_code) + page_size)
 		);
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 00bfeb18e..fb2053b89 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -1028,7 +1028,7 @@ COMMAND_HANDLER(handle_flash_padded_value_command)
 
 	COMMAND_PARSE_NUMBER(u8, CMD_ARGV[1], p->default_padded_value);
 
-	command_print(CMD, "Default padded value set to 0x%" PRIx8 " for flash bank %u", \
+	command_print(CMD, "Default padded value set to 0x%" PRIx8 " for flash bank %u",
 			p->default_padded_value, p->bank_number);
 
 	return retval;
diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index c81f8043b..d35e15128 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -107,7 +107,7 @@ static int armjtagew_execute_queue(void)
 		switch (cmd->type) {
 			case JTAG_RUNTEST:
 				LOG_DEBUG_IO("runtest %i cycles, end in %i",
-						cmd->cmd.runtest->num_cycles, \
+						cmd->cmd.runtest->num_cycles,
 						cmd->cmd.runtest->end_state);
 
 				armjtagew_end_state(cmd->cmd.runtest->end_state);
@@ -122,8 +122,8 @@ static int armjtagew_execute_queue(void)
 				break;
 
 			case JTAG_PATHMOVE:
-				LOG_DEBUG_IO("pathmove: %i states, end in %i", \
-						cmd->cmd.pathmove->num_states, \
+				LOG_DEBUG_IO("pathmove: %i states, end in %i",
+						cmd->cmd.pathmove->num_states,
 						cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
 
 				armjtagew_path_move(cmd->cmd.pathmove->num_states,
@@ -459,10 +459,10 @@ static int armjtagew_get_version_info(void)
 	auxinfo[256] = '\0';
 
 	LOG_INFO(
-		"ARM-JTAG-EW firmware version %d.%d, hardware revision %c, SN=%s, Additional info: %s",	\
+		"ARM-JTAG-EW firmware version %d.%d, hardware revision %c, SN=%s, Additional info: %s",
 		usb_in_buffer[1],
-		usb_in_buffer[0], \
-		isgraph(usb_in_buffer[2]) ? usb_in_buffer[2] : 'X', \
+		usb_in_buffer[0],
+		isgraph(usb_in_buffer[2]) ? usb_in_buffer[2] : 'X',
 		sn,
 		auxinfo);
 
@@ -750,7 +750,7 @@ static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
 		return -1;
 	}
 
-	result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT, \
+	result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT,
 			(char *)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT);
 
 	LOG_DEBUG_IO("armjtagew_usb_write, out_length = %d, result = %d", out_length, result);
@@ -764,7 +764,7 @@ static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
 /* Read data from USB into in_buffer. */
 static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
 {
-	int result = usb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN, \
+	int result = usb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN,
 			(char *)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT);
 
 	LOG_DEBUG_IO("armjtagew_usb_read, result = %d", result);
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 3dcadc813..80202ed29 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1525,7 +1525,7 @@ COMMAND_HANDLER(jlink_handle_config_mac_address_command)
 	} else if (CMD_ARGC == 1) {
 		str = CMD_ARGV[0];
 
-		if ((strlen(str) != 17) || (str[2] != ':' || str[5] != ':' || \
+		if ((strlen(str) != 17) || (str[2] != ':' || str[5] != ':' ||
 				str[8] != ':' || str[11] != ':' || str[14] != ':')) {
 			command_print(CMD, "Invalid MAC address format.");
 			return ERROR_COMMAND_SYNTAX_ERROR;
diff --git a/src/jtag/drivers/opendous.c b/src/jtag/drivers/opendous.c
index 6812ef649..bb223f417 100644
--- a/src/jtag/drivers/opendous.c
+++ b/src/jtag/drivers/opendous.c
@@ -259,7 +259,7 @@ static int opendous_execute_queue(void)
 	while (cmd != NULL) {
 		switch (cmd->type) {
 			case JTAG_RUNTEST:
-				LOG_DEBUG_IO("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \
+				LOG_DEBUG_IO("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles,
 					cmd->cmd.runtest->end_state);
 
 				if (cmd->cmd.runtest->end_state != -1)
@@ -276,8 +276,8 @@ static int opendous_execute_queue(void)
 				break;
 
 			case JTAG_PATHMOVE:
-				LOG_DEBUG_IO("pathmove: %i states, end in %i", \
-					cmd->cmd.pathmove->num_states, \
+				LOG_DEBUG_IO("pathmove: %i states, end in %i",
+					cmd->cmd.pathmove->num_states,
 					cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
 
 				opendous_path_move(cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path);
@@ -770,7 +770,7 @@ int opendous_usb_write(struct opendous_jtag *opendous_jtag, int out_length)
 			LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_OUT,
 			FUNC_WRITE_DATA, 0, 0, (char *) usb_out_buffer, out_length, OPENDOUS_USB_TIMEOUT);
 	} else {
-		jtag_libusb_bulk_write(opendous_jtag->usb_handle, OPENDOUS_WRITE_ENDPOINT, \
+		jtag_libusb_bulk_write(opendous_jtag->usb_handle, OPENDOUS_WRITE_ENDPOINT,
 			(char *)usb_out_buffer, out_length, OPENDOUS_USB_TIMEOUT, &result);
 	}
 #ifdef _DEBUG_USB_COMMS_
diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 14bac2a2f..03d3da7bb 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -2319,7 +2319,7 @@ static int stlink_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
 
 	while (count) {
 
-		bytes_remaining = (size != 1) ? \
+		bytes_remaining = (size != 1) ?
 				stlink_max_block_size(h->max_mem_packet, addr) : stlink_usb_block(h);
 
 		if (count < bytes_remaining)
@@ -2404,7 +2404,7 @@ static int stlink_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
 
 	while (count) {
 
-		bytes_remaining = (size != 1) ? \
+		bytes_remaining = (size != 1) ?
 				stlink_max_block_size(h->max_mem_packet, addr) : stlink_usb_block(h);
 
 		if (count < bytes_remaining)
@@ -2528,7 +2528,7 @@ static int stlink_match_speed_map(const struct speed_map *map, unsigned int map_
 		match = false;
 
 	if (!match && query) {
-		LOG_INFO("Unable to match requested speed %d kHz, using %d kHz", \
+		LOG_INFO("Unable to match requested speed %d kHz, using %d kHz",
 				khz, map[speed_index].speed);
 	}
 
diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
index b406c0321..e2556cec0 100644
--- a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
+++ b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
@@ -45,7 +45,7 @@ static int ublast2_libusb_read(struct ublast_lowlevel *low, uint8_t *buf,
 	int ret, tmp = 0;
 
 	ret = jtag_libusb_bulk_read(low->libusb_dev,
-					    USBBLASTER_EPIN | \
+					    USBBLASTER_EPIN |
 					    LIBUSB_ENDPOINT_IN,
 					    (char *)buf,
 					    size,
@@ -61,7 +61,7 @@ static int ublast2_libusb_write(struct ublast_lowlevel *low, uint8_t *buf,
 	int ret, tmp = 0;
 
 	ret = jtag_libusb_bulk_write(low->libusb_dev,
-						USBBLASTER_EPOUT | \
+						USBBLASTER_EPOUT |
 						LIBUSB_ENDPOINT_OUT,
 						(char *)buf,
 						size,
@@ -106,7 +106,7 @@ static int ublast2_write_firmware_section(struct libusb_device_handle *libusb_de
 			chunk_size = bytes_remaining;
 
 		jtag_libusb_control_transfer(libusb_dev,
-					     LIBUSB_REQUEST_TYPE_VENDOR | \
+					     LIBUSB_REQUEST_TYPE_VENDOR |
 					     LIBUSB_ENDPOINT_OUT,
 					     USBBLASTER_CTRL_LOAD_FIRM,
 					     addr,
@@ -152,7 +152,7 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 
 	char value = CPU_RESET;
 	jtag_libusb_control_transfer(libusb_dev,
-				     LIBUSB_REQUEST_TYPE_VENDOR | \
+				     LIBUSB_REQUEST_TYPE_VENDOR |
 				     LIBUSB_ENDPOINT_OUT,
 				     USBBLASTER_CTRL_LOAD_FIRM,
 				     EZUSB_CPUCS,
@@ -173,7 +173,7 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 
 	value = !CPU_RESET;
 	jtag_libusb_control_transfer(libusb_dev,
-				     LIBUSB_REQUEST_TYPE_VENDOR | \
+				     LIBUSB_REQUEST_TYPE_VENDOR |
 				     LIBUSB_ENDPOINT_OUT,
 				     USBBLASTER_CTRL_LOAD_FIRM,
 				     EZUSB_CPUCS,
@@ -230,7 +230,7 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
 
 	char buffer[5];
 	jtag_libusb_control_transfer(low->libusb_dev,
-				     LIBUSB_REQUEST_TYPE_VENDOR | \
+				     LIBUSB_REQUEST_TYPE_VENDOR |
 				     LIBUSB_ENDPOINT_IN,
 				     USBBLASTER_CTRL_READ_REV,
 				     0,
diff --git a/src/jtag/drivers/usb_blaster/usb_blaster.c b/src/jtag/drivers/usb_blaster/usb_blaster.c
index fcb594f30..d30483b63 100644
--- a/src/jtag/drivers/usb_blaster/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster/usb_blaster.c
@@ -1042,8 +1042,8 @@ static const struct command_registration ublast_command_handlers[] = {
 		.name = "usb_blaster_vid_pid",
 		.handler = ublast_handle_vid_pid_command,
 		.mode = COMMAND_CONFIG,
-		.help = "the vendor ID and product ID of the USB-Blaster and " \
-			"vendor ID and product ID of the uninitialized device " \
+		.help = "the vendor ID and product ID of the USB-Blaster and "
+			"vendor ID and product ID of the uninitialized device "
 			"for USB-Blaster II",
 		.usage = "vid pid vid_uninit pid_uninit",
 	},
diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index 6517ce4ad..7b27eaff2 100644
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -381,7 +381,7 @@ static void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag)
 static unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen)
 {
 	int res = usb_bulk_write(usbprog_jtag->usb_handle, 3, msg, msglen, 100);
-	if ((msg[0] == 2) || (msg[0] == 1) || (msg[0] == 4) || (msg[0] == 0) ||	\
+	if ((msg[0] == 2) || (msg[0] == 1) || (msg[0] == 4) || (msg[0] == 0) ||
 	    (msg[0] == 6) || (msg[0] == 0x0A) || (msg[0] == 9))
 		return 1;
 	if (res == msglen) {
diff --git a/src/jtag/drivers/versaloon/versaloon_internal.h b/src/jtag/drivers/versaloon/versaloon_internal.h
index 497b6b9ce..8372970b1 100644
--- a/src/jtag/drivers/versaloon/versaloon_internal.h
+++ b/src/jtag/drivers/versaloon/versaloon_internal.h
@@ -91,7 +91,7 @@ struct versaloon_pending_t {
 	void *extra_data;
 	versaloon_callback_t callback;
 };
-extern struct versaloon_pending_t \
+extern struct versaloon_pending_t
 	versaloon_pending[VERSALOON_MAX_PENDING_NUMBER];
 extern uint16_t versaloon_pending_idx;
 void versaloon_set_pending_id(uint32_t id);
diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index eb4370233..5fb9bcdcc 100644
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -292,7 +292,7 @@ static int vsllink_interface_init(void)
 	libusb_init(&vsllink_handle->libusb_ctx);
 
 	if (ERROR_OK != vsllink_usb_open(vsllink_handle)) {
-		LOG_ERROR("Can't find USB JTAG Interface!" \
+		LOG_ERROR("Can't find USB JTAG Interface!"
 			"Please check connection and permissions.");
 		return ERROR_JTAG_INIT_FAILED;
 	}
diff --git a/src/jtag/minidummy/minidummy.c b/src/jtag/minidummy/minidummy.c
index 1fce317f0..7d5e6a98a 100644
--- a/src/jtag/minidummy/minidummy.c
+++ b/src/jtag/minidummy/minidummy.c
@@ -170,7 +170,7 @@ void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, const uint8_t *bu
 int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap, uint32_t opcode,
 		uint32_t *data, size_t count)
 {
-	int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap, \
+	int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
 			uint32_t opcode, uint32_t *data, size_t count);
 	return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
 }
diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 9e59c41a5..0f18d171c 100644
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -1379,8 +1379,8 @@ static int linux_thread_packet(struct connection *connection, char const *packet
 						 target->rtos->
 						 current_threadid)
 				&& (target->rtos->current_threadid != -1))
-					LOG_WARNING("WARNING! current GDB thread do not match" \
-							"current thread running." \
+					LOG_WARNING("WARNING! current GDB thread do not match"
+							"current thread running."
 							"Switch thread in GDB to threadid %d",
 							(int)ct->threadid);
 
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index f9fe4c293..6a9e261cd 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1004,7 +1004,7 @@ static int gdb_new_connection(struct connection *connection)
 				continue;
 			retval = get_flash_bank_by_num(i, &p);
 			if (retval != ERROR_OK) {
-				LOG_ERROR("Connect failed. Consider setting up a gdb-attach event for the target " \
+				LOG_ERROR("Connect failed. Consider setting up a gdb-attach event for the target "
 						"to prepare target for GDB connect, or use 'gdb_memory_map disable'.");
 				return retval;
 			}
@@ -2857,7 +2857,7 @@ static bool gdb_handle_vcont_packet(struct connection *connection, const char *p
 			if (gdb_connection->sync) {
 				gdb_connection->sync = false;
 				if (ct->state == TARGET_HALTED) {
-					LOG_DEBUG("stepi ignored. GDB will now fetch the register state " \
+					LOG_DEBUG("stepi ignored. GDB will now fetch the register state "
 									"from the target.");
 					gdb_sig_halted(connection);
 					log_remove_callback(gdb_log_callback, connection);
@@ -3330,7 +3330,7 @@ static int gdb_input_inner(struct connection *connection)
 								"Waiting for target to halt.");
 						already_running = true;
 					} else if (target->state != TARGET_HALTED) {
-						LOG_WARNING("The target is not in the halted nor running stated, " \
+						LOG_WARNING("The target is not in the halted nor running stated, "
 								"stepi/continue ignored.");
 						nostep = true;
 					} else if ((packet[0] == 's') && gdb_con->sync) {
@@ -3339,7 +3339,7 @@ static int gdb_input_inner(struct connection *connection)
 						 * make only the single stepping have the sync feature...
 						 */
 						nostep = true;
-						LOG_DEBUG("stepi ignored. GDB will now fetch the register state " \
+						LOG_DEBUG("stepi ignored. GDB will now fetch the register state "
 								"from the target.");
 					}
 					gdb_con->sync = false;
diff --git a/src/svf/svf.c b/src/svf/svf.c
index 54fc7d139..fd27417e0 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -1540,8 +1540,8 @@ XXR_common:
 
 	if (debug_level >= LOG_LVL_DEBUG) {
 		/* for convenient debugging, execute tap if possible */
-		if ((svf_buffer_index > 0) && \
-				(((command != STATE) && (command != RUNTEST)) || \
+		if ((svf_buffer_index > 0) &&
+				(((command != STATE) && (command != RUNTEST)) ||
 						((command == STATE) && (num_of_argu == 2)))) {
 			if (ERROR_OK != svf_execute_tap())
 				return ERROR_FAIL;
@@ -1555,8 +1555,8 @@ XXR_common:
 		/* for fast executing, execute tap if necessary */
 		/* half of the buffer is for the next command */
 		if (((svf_buffer_index >= SVF_MAX_BUFFER_SIZE_TO_COMMIT) ||
-				(svf_check_tdo_para_index >= SVF_CHECK_TDO_PARA_SIZE / 2)) && \
-				(((command != STATE) && (command != RUNTEST)) || \
+				(svf_check_tdo_para_index >= SVF_CHECK_TDO_PARA_SIZE / 2)) &&
+				(((command != STATE) && (command != RUNTEST)) ||
 						((command == STATE) && (num_of_argu == 2))))
 			return svf_execute_tap();
 	}
diff --git a/src/target/arc_cmd.c b/src/target/arc_cmd.c
index a8c3bb43a..fad8ca947 100644
--- a/src/target/arc_cmd.c
+++ b/src/target/arc_cmd.c
@@ -383,7 +383,7 @@ static int jim_arc_get_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a
 	/* Register number */
 	JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &regnum));
 	if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) {
-		Jim_SetResultFormatted(goi.interp, "Core register number %i " \
+		Jim_SetResultFormatted(goi.interp, "Core register number %i "
 			"is invalid. Must less then 64 and not 61 and 62.", regnum);
 		return JIM_ERR;
 	}
@@ -426,7 +426,7 @@ static int jim_arc_set_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a
 	/* Register number */
 	JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &regnum));
 	if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) {
-		Jim_SetResultFormatted(goi.interp, "Core register number %i " \
+		Jim_SetResultFormatted(goi.interp, "Core register number %i "
 			"is invalid. Must less then 64 and not 61 and 62.", regnum);
 		return JIM_ERR;
 	}
@@ -447,9 +447,9 @@ static const struct command_registration arc_jtag_command_group[] = {
 		.name = "get-aux-reg",
 		.jim_handler = jim_arc_get_aux_reg,
 		.mode = COMMAND_EXEC,
-		.help = "Get AUX register by number. This command does a " \
-			"raw JTAG request that bypasses OpenOCD register cache "\
-			"and thus is unsafe and can have unexpected consequences. "\
+		.help = "Get AUX register by number. This command does a "
+			"raw JTAG request that bypasses OpenOCD register cache "
+			"and thus is unsafe and can have unexpected consequences. "
 			"Use at your own risk.",
 		.usage = "arc jtag get-aux-reg <regnum>"
 	},
@@ -457,9 +457,9 @@ static const struct command_registration arc_jtag_command_group[] = {
 		.name = "set-aux-reg",
 		.jim_handler = jim_arc_set_aux_reg,
 		.mode = COMMAND_EXEC,
-		.help = "Set AUX register by number. This command does a " \
-			"raw JTAG request that bypasses OpenOCD register cache "\
-			"and thus is unsafe and can have unexpected consequences. "\
+		.help = "Set AUX register by number. This command does a "
+			"raw JTAG request that bypasses OpenOCD register cache "
+			"and thus is unsafe and can have unexpected consequences. "
 			"Use at your own risk.",
 		.usage = "arc jtag set-aux-reg <regnum> <value>"
 	},
@@ -467,9 +467,9 @@ static const struct command_registration arc_jtag_command_group[] = {
 		.name = "get-core-reg",
 		.jim_handler = jim_arc_get_core_reg,
 		.mode = COMMAND_EXEC,
-		.help = "Get/Set core register by number. This command does a " \
-			"raw JTAG request that bypasses OpenOCD register cache "\
-			"and thus is unsafe and can have unexpected consequences. "\
+		.help = "Get/Set core register by number. This command does a "
+			"raw JTAG request that bypasses OpenOCD register cache "
+			"and thus is unsafe and can have unexpected consequences. "
 			"Use at your own risk.",
 		.usage = "arc jtag get-core-reg <regnum> [<value>]"
 	},
@@ -477,9 +477,9 @@ static const struct command_registration arc_jtag_command_group[] = {
 		.name = "set-core-reg",
 		.jim_handler = jim_arc_set_core_reg,
 		.mode = COMMAND_EXEC,
-		.help = "Get/Set core register by number. This command does a " \
-			"raw JTAG request that bypasses OpenOCD register cache "\
-			"and thus is unsafe and can have unexpected consequences. "\
+		.help = "Get/Set core register by number. This command does a "
+			"raw JTAG request that bypasses OpenOCD register cache "
+			"and thus is unsafe and can have unexpected consequences. "
 			"Use at your own risk.",
 		.usage = "arc jtag set-core-reg <regnum> [<value>]"
 	},
diff --git a/src/target/nds32_cmd.c b/src/target/nds32_cmd.c
index 88d8b4512..7bf7e60c7 100644
--- a/src/target/nds32_cmd.c
+++ b/src/target/nds32_cmd.c
@@ -1007,7 +1007,7 @@ static const struct command_registration nds32_exec_command_handlers[] = {
 		.handler = handle_nds32_global_stop_command,
 		.mode = COMMAND_ANY,
 		.usage = "['on'|'off']",
-		.help = "turn on/off global stop. After turning on, every load/store" \
+		.help = "turn on/off global stop. After turning on, every load/store"
 			 "instructions will be stopped to check memory access.",
 	},
 	{
@@ -1015,7 +1015,7 @@ static const struct command_registration nds32_exec_command_handlers[] = {
 		.handler = handle_nds32_soft_reset_halt_command,
 		.mode = COMMAND_ANY,
 		.usage = "['on'|'off']",
-		.help = "as issuing rest-halt, to use soft-reset-halt or not." \
+		.help = "as issuing rest-halt, to use soft-reset-halt or not."
 			 "the feature is for backward-compatible.",
 	},
 	{
diff --git a/src/target/nds32_disassembler.c b/src/target/nds32_disassembler.c
index f27aba2cc..0cfd197d2 100644
--- a/src/target/nds32_disassembler.c
+++ b/src/target/nds32_disassembler.c
@@ -493,7 +493,7 @@ static int nds32_parse_mem(struct nds32 *nds32, uint32_t opcode, uint32_t addres
 			switch (sub_opcode & 0x7) {
 				case 0: /* LB */
 					nds32_parse_type_3(opcode, &(instruction->info.rt),
-							&(instruction->info.ra), \
+							&(instruction->info.ra),
 							&(instruction->info.rb), &(instruction->info.imm));
 					instruction->type = NDS32_INSN_LOAD_STORE;
 					nds32_get_mapped_reg(nds32, instruction->info.ra, &val_ra);
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index e30294114..4a323e4ee 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -3712,13 +3712,13 @@ int riscv013_test_compliance(struct target *target)
 	But at any rate, this is not legal and should cause an error. */
 	COMPLIANCE_WRITE(target, DMI_COMMAND, 0xAAAAAAAA);
 	COMPLIANCE_READ(target, &testvar_read, DMI_ABSTRACTCS);
-	COMPLIANCE_TEST(get_field(testvar_read, DMI_ABSTRACTCS_CMDERR) == CMDERR_NOT_SUPPORTED, \
+	COMPLIANCE_TEST(get_field(testvar_read, DMI_ABSTRACTCS_CMDERR) == CMDERR_NOT_SUPPORTED,
 			"Illegal COMMAND should result in UNSUPPORTED");
 	COMPLIANCE_WRITE(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);
 
 	COMPLIANCE_WRITE(target, DMI_COMMAND, 0x55555555);
 	COMPLIANCE_READ(target, &testvar_read, DMI_ABSTRACTCS);
-	COMPLIANCE_TEST(get_field(testvar_read, DMI_ABSTRACTCS_CMDERR) == CMDERR_NOT_SUPPORTED, \
+	COMPLIANCE_TEST(get_field(testvar_read, DMI_ABSTRACTCS_CMDERR) == CMDERR_NOT_SUPPORTED,
 			"Illegal COMMAND should result in UNSUPPORTED");
 	COMPLIANCE_WRITE(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);
 

commit e66bb9d3121eef35c312997aacb401847249a5cb
Author: Antonio Borneo <bor...@gm...>
Date:   Mon May 6 00:35:52 2019 +0200

    coding style: add parenthesis around the argument of sizeof
    
    The script checkpatch available in new Linux kernel offers an
    experimental feature for automatically fix the code in place.
    While still experimental, the feature works quite well for simple
    fixes, like parenthesis.
    
    This patch has been created automatically with the script under
    review for inclusion in OpenOCD, using the command:
    
            find src/ -type f -exec ./tools/scripts/checkpatch.pl \
            -q --types SIZEOF_PARENTHESIS --fix-inplace -f {} \;
    
    Change-Id: I8adb325bdb0e13211f8bae8b4770ec1979c176bf
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5618
    Reviewed-by: Andreas Fritiofson <and...@gm...>
    Tested-by: jenkins

diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c
index 17e6f680d..167b40150 100644
--- a/src/flash/nand/davinci.c
+++ b/src/flash/nand/davinci.c
@@ -730,7 +730,7 @@ NAND_DEVICE_COMMAND_HANDLER(davinci_nand_device_command)
 		goto fail;
 	}
 
-	info = calloc(1, sizeof *info);
+	info = calloc(1, sizeof(*info));
 	if (info == NULL)
 		goto fail;
 
diff --git a/src/jtag/aice/aice_transport.c b/src/jtag/aice/aice_transport.c
index d0f7a49c0..ea710ad25 100644
--- a/src/jtag/aice/aice_transport.c
+++ b/src/jtag/aice/aice_transport.c
@@ -174,7 +174,7 @@ COMMAND_HANDLER(handle_scan_chain_command)
 	while (tap) {
 		uint32_t expected, expected_mask, ii;
 
-		snprintf(expected_id, sizeof expected_id, "0x%08x",
+		snprintf(expected_id, sizeof(expected_id), "0x%08x",
 			(unsigned)((tap->expected_ids_cnt > 0)
 				   ? tap->expected_ids[0]
 				   : 0));
@@ -196,7 +196,7 @@ COMMAND_HANDLER(handle_scan_chain_command)
 			(unsigned int)(expected_mask));
 
 		for (ii = 1; ii < tap->expected_ids_cnt; ii++) {
-			snprintf(expected_id, sizeof expected_id, "0x%08x",
+			snprintf(expected_id, sizeof(expected_id), "0x%08x",
 				(unsigned) tap->expected_ids[ii]);
 			if (tap->ignore_version)
 				expected_id[2] = '*';
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 2d0c84205..f12ab5924 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -1269,7 +1269,7 @@ static int jtag_examine_chain(void)
 			 * REVISIT create a jtag_alloc(chip, tap) routine, and
 			 * share it with jim_newtap_cmd().
 			 */
-			tap = calloc(1, sizeof *tap);
+			tap = calloc(1, sizeof(*tap));
 			if (!tap) {
 				retval = ERROR_FAIL;
 				goto out;
diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c
index db106bb05..f5918a055 100644
--- a/src/jtag/drivers/amt_jtagaccel.c
+++ b/src/jtag/drivers/amt_jtagaccel.c
@@ -393,7 +393,7 @@ int amt_jtagaccel_get_giveio_access(void)
 	HANDLE h;
 	OSVERSIONINFO version;
 
-	version.dwOSVersionInfoSize = sizeof version;
+	version.dwOSVersionInfoSize = sizeof(version);
 	if (!GetVersionEx(&version)) {
 		errno = EINVAL;
 		return -1;
diff --git a/src/jtag/drivers/gw16012.c b/src/jtag/drivers/gw16012.c
index 2e8dad896..d1699ef01 100644
--- a/src/jtag/drivers/gw16012.c
+++ b/src/jtag/drivers/gw16012.c
@@ -350,7 +350,7 @@ static int gw16012_get_giveio_access(void)
 	HANDLE h;
 	OSVERSIONINFO version;
 
-	version.dwOSVersionInfoSize = sizeof version;
+	version.dwOSVersionInfoSize = sizeof(version);
 	if (!GetVersionEx(&version)) {
 		errno = EINVAL;
 		return -1;
diff --git a/src/jtag/drivers/kitprog.c b/src/jtag/drivers/kitprog.c
index 28ed7ac61..efb8da2cd 100644
--- a/src/jtag/drivers/kitprog.c
+++ b/src/jtag/drivers/kitprog.c
@@ -358,7 +358,7 @@ static int kitprog_get_version(void)
 	unsigned char command[3] = {HID_TYPE_START | HID_TYPE_WRITE, 0x00, HID_COMMAND_VERSION};
 	unsigned char data[64];
 
-	ret = kitprog_hid_command(command, sizeof command, data, sizeof data);
+	ret = kitprog_hid_command(command, sizeof(command), data, sizeof(data));
 	if (ret != ERROR_OK)
 		return ret;
 
@@ -376,7 +376,7 @@ static int kitprog_get_millivolts(void)
 	unsigned char command[3] = {HID_TYPE_START | HID_TYPE_READ, 0x00, HID_COMMAND_POWER};
 	unsigned char data[64];
 
-	ret = kitprog_hid_command(command, sizeof command, data, sizeof data);
+	ret = kitprog_hid_command(command, sizeof(command), data, sizeof(data));
 	if (ret != ERROR_OK)
 		return ret;
 
@@ -603,7 +603,7 @@ static int kitprog_generic_acquire(void)
 	 * will take the Cortex-M3 out of reset and enable debugging.
 	 */
 	for (int i = 0; i < 2; i++) {
-		for (uint8_t j = 0; j < sizeof devices && acquire_count == i; j++) {
+		for (uint8_t j = 0; j < sizeof(devices) && acquire_count == i; j++) {
 			retval = kitprog_acquire_psoc(devices[j], ACQUIRE_MODE_RESET, 3);
 			if (retval != ERROR_OK) {
 				LOG_DEBUG("Aquisition function failed for device 0x%02x.", devices[j]);
diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c
index 6d15203ae..b3abd1205 100644
--- a/src/jtag/drivers/parport.c
+++ b/src/jtag/drivers/parport.c
@@ -237,7 +237,7 @@ static int parport_get_giveio_access(void)
 	HANDLE h;
 	OSVERSIONINFO version;
 
-	version.dwOSVersionInfoSize = sizeof version;
+	version.dwOSVersionInfoSize = sizeof(version);
 	if (!GetVersionEx(&version)) {
 		errno = EINVAL;
 		return -1;
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 734b9c1cb..f52cbd606 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -965,7 +965,7 @@ COMMAND_HANDLER(handle_scan_chain_command)
 	while (tap) {
 		uint32_t expected, expected_mask, ii;
 
-		snprintf(expected_id, sizeof expected_id, "0x%08x",
+		snprintf(expected_id, sizeof(expected_id), "0x%08x",
 			(unsigned)((tap->expected_ids_cnt > 0)
 				   ? tap->expected_ids[0]
 				   : 0));
@@ -987,7 +987,7 @@ COMMAND_HANDLER(handle_scan_chain_command)
 			(unsigned int)(expected_mask));
 
 		for (ii = 1; ii < tap->expected_ids_cnt; ii++) {
-			snprintf(expected_id, sizeof expected_id, "0x%08x",
+			snprintf(expected_id, sizeof(expected_id), "0x%08x",
 				(unsigned) tap->expected_ids[ii]);
 			if (tap->ignore_version)
 				expected_id[2] = '*';
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 51f2a337a..10a1d6de5 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1105,7 +1105,7 @@ static int arm11_target_create(struct target *target, Jim_Interp *interp)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	arm11 = calloc(1, sizeof *arm11);
+	arm11 = calloc(1, sizeof(*arm11));
 	if (!arm11)
 		return ERROR_FAIL;
 
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 2232b3ef6..a758db58f 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -1183,7 +1183,7 @@ int arm11_dpm_init(struct arm11_common *arm11, uint32_t didr)
 
 	/* alloc enough to enable all breakpoints and watchpoints at once */
 	arm11->bpwp_actions = calloc(2 * (dpm->nbp + dpm->nwp),
-			sizeof *arm11->bpwp_actions);
+			sizeof(*arm11->bpwp_actions));
 	if (!arm11->bpwp_actions)
 		return ERROR_FAIL;
 
diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index 04c392296..55aaddd0a 100644
--- a/src/target/arm_disassembler.c
+++ b/src/target/arm_disassembler.c
@@ -2672,7 +2672,7 @@ static int evaluate_load_store_multiple_thumb(uint16_t opcode,
 			instruction->type = ARM_STM;
 			mnemonic = "STM";
 		}
-		snprintf(ptr_name, sizeof ptr_name, "r%i%s, ", Rn, wback);
+		snprintf(ptr_name, sizeof(ptr_name), "r%i%s, ", Rn, wback);
 	} else {/* push/pop */
 		Rn = 13;/* SP */
 		if (L) {
diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index a01339c1f..495d63ec2 100644
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -1096,8 +1096,8 @@ int arm_dpm_setup(struct arm_dpm *dpm)
 
 	dpm->nbp = 1 + ((dpm->didr >> 24) & 0xf);
 	dpm->nwp = 1 + ((dpm->didr >> 28) & 0xf);
-	dpm->dbp = calloc(dpm->nbp, sizeof *dpm->dbp);
-	dpm->dwp = calloc(dpm->nwp, sizeof *dpm->dwp);
+	dpm->dbp = calloc(dpm->nbp, sizeof(*dpm->dbp));
+	dpm->dwp = calloc(dpm->nwp, sizeof(*dpm->dwp));
 
 	if (!dpm->dbp || !dpm->dwp) {
 		free(dpm->dbp);
diff --git a/src/target/armv8_dpm.c b/src/target/armv8_dpm.c
index 5be52726c..a3edb7f47 100644
--- a/src/target/armv8_dpm.c
+++ b/src/target/armv8_dpm.c
@@ -1471,10 +1471,10 @@ int armv8_dpm_setup(struct arm_dpm *dpm)
 	/* FIXME add vector catch support */
 
 	dpm->nbp = 1 + ((dpm->didr >> 12) & 0xf);
-	dpm->dbp = calloc(dpm->nbp, sizeof *dpm->dbp);
+	dpm->dbp = calloc(dpm->nbp, sizeof(*dpm->dbp));
 
 	dpm->nwp = 1 + ((dpm->didr >> 20) & 0xf);
-	dpm->dwp = calloc(dpm->nwp, sizeof *dpm->dwp);
+	dpm->dwp = calloc(dpm->nwp, sizeof(*dpm->dwp));
 
 	if (!dpm->dbp || !dpm->dwp) {
 		free(dpm->dbp);
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index af245dfc0..27febd3d7 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -1980,7 +1980,7 @@ static void cortex_m_dwt_addreg(struct target *t, struct reg *r, const struct dw
 {
 	struct dwt_reg_state *state;
 
-	state = calloc(1, sizeof *state);
+	state = calloc(1, sizeof(*state));
 	if (!state)
 		return;
 	state->addr = d->addr;
@@ -2021,7 +2021,7 @@ fail0:
 		return;
 	}
 
-	cache = calloc(1, sizeof *cache);
+	cache = calloc(1, sizeof(*cache));
 	if (!cache) {
 fail1:
 		free(cm->dwt_comparator_list);
@@ -2029,7 +2029,7 @@ fail1:
 	}
 	cache->name = "Cortex-M DWT registers";
 	cache->num_regs = 2 + cm->dwt_num_comp * 3;
-	cache->reg_list = calloc(cache->num_regs, sizeof *cache->reg_list);
+	cache->reg_list = calloc(cache->num_regs, sizeof(*cache->reg_list));
 	if (!cache->reg_list) {
 		free(cache);
 		goto fail1;
diff --git a/src/target/xscale.c b/src/target/xscale.c
index f879a9cc9..edab4f9fc 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -156,7 +156,7 @@ static int xscale_jtag_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_s
 		struct scan_field field;
 		uint8_t scratch[4] = { 0 };
 
-		memset(&field, 0, sizeof field);
+		memset(&field, 0, sizeof(field));
 		field.num_bits = tap->ir_length;
 		field.out_value = scratch;
 		buf_set_u32(scratch, 0, field.num_bits, new_instr);
@@ -186,7 +186,7 @@ static int xscale_read_dcsr(struct target *target)
 	buf_set_u32(&field0, 1, 1, xscale->hold_rst);
 	buf_set_u32(&field0, 2, 1, xscale->external_debug_break);
 
-	memset(&fields, 0, sizeof fields);
+	memset(&fields, 0, sizeof(fields));
 
 	fields[0].num_bits = 3;
 	fields[0].out_value = &field0;
@@ -259,7 +259,7 @@ static int xscale_receive(struct target *target, uint32_t *buffer, int num_words
 	path[1] = TAP_DRCAPTURE;
 	path[2] = TAP_DRSHIFT;
 
-	memset(&fields, 0, sizeof fields);
+	memset(&fields, 0, sizeof(fields));
 
 	fields[0].num_bits = 3;
 	uint8_t tmp;
@@ -367,7 +367,7 @@ static int xscale_read_tx(struct target *target, int consume)
 	noconsume_path[4] = TAP_DREXIT2;
 	noconsume_path[5] = TAP_DRSHIFT;
 
-	memset(&fields, 0, sizeof fields);
+	memset(&fields, 0, sizeof(fields));
 
 	fields[0].num_bits = 3;
 	fields[0].in_value = &field0_in;
@@ -442,7 +442,7 @@ static int xscale_write_rx(struct target *target)
 		XSCALE_DBGRX << xscale->xscale_variant,
 		TAP_IDLE);
 
-	memset(&fields, 0, sizeof fields);
+	memset(&fields, 0, sizeof(fields));
 
 	fields[0].num_bits = 3;
 	fields[0].out_value = &field0_out;
@@ -598,7 +598,7 @@ static int xscale_write_dcsr(struct target *target, int hold_rst, int ext_dbg_br
 	buf_set_u32(&field0, 1, 1, xscale->hold_rst);
 	buf_set_u32(&field0, 2, 1, xscale->external_debug_break);
 
-	memset(&fields, 0, sizeof fields);
+	memset(&fields, 0, sizeof(fields));
 
 	fields[0].num_bits = 3;
 	fields[0].out_value = &field0;
@@ -666,7 +666,7 @@ static int xscale_load_ic(struct target *target, uint32_t va, uint32_t buffer[8]
 	/* virtual address of desired cache line */
 	buf_set_u32(packet, 0, 27, va >> 5);
 
-	memset(&fields, 0, sizeof fields);
+	memset(&fields, 0, sizeof(fields));
 
 	fields[0].num_bits = 6;
 	fields[0].out_value = &cmd;
@@ -713,7 +713,7 @@ static int xscale_invalidate_ic_line(struct target *target, uint32_t va)
 	/* virtual address of desired cache line */
 	buf_set_u32(packet, 0, 27, va >> 5);
 
-	memset(&fields, 0, sizeof fields);
+	memset(&fields, 0, sizeof(fields));
 
 	fields[0].num_bits = 6;
 	fields[0].out_value = &cmd;
@@ -1551,7 +1551,7 @@ static int xscale_deassert_reset(struct target *target)
 		 * coprocessors, trace data, etc.
 		 */
 		address = xscale->handler_address;
-		for (unsigned binary_size = sizeof xscale_debug_handler;
+		for (unsigned binary_size = sizeof(xscale_debug_handler);
 			binary_size > 0;
 			binary_size -= buf_cnt, buffer += buf_cnt) {
 			uint32_t cache_line[8];
@@ -3004,7 +3004,7 @@ static int xscale_target_create(struct target *target, Jim_Interp *interp)
 {
 	struct xscale_common *xscale;
 
-	if (sizeof xscale_debug_handler > 0x800) {
+	if (sizeof(xscale_debug_handler) > 0x800) {
 		LOG_ERROR("debug_handler.bin: larger than 2kb");
 		return ERROR_FAIL;
 	}

commit 9b29cb58acbd14ed831d68fce4d6e6a1728f8caf
Author: Antonio Borneo <bor...@gm...>
Date:   Mon May 6 00:03:03 2019 +0200

    coding style: remove useless break after a goto or return
    
    In a switch/case statement, a break placed after a goto or return
    is never executed.
    The script checkpatch available in Linux kernel v5.1 issues a
    warning for such unused break statements.
    In the process of reviewing the new checkpatch for its inclusion
    in OpenOCD, let's get rid of these warnings.
    
    The script checkpatch is unable to fixup automatically this case.
    Thanks to having "break" command using a single code line, this
    patch has been generated using the script below:
    
            find src/ -type f -exec ./tools/scripts/checkpatch.pl -q \
             --types UNNECESSARY_BREAK -f {} \; \
            | sed -n '/^#/{s/^.*FILE: //;s/:$//;s/:/ /;p}' \
            | awk 'function P() {print "sed -i '\''"b"'\'' "a};
                   {
                     if ($1!=a) {
                       if (a) {P()};
                       a=$1;
                       b=$2"{d}";
                     } else {
                       b=b";"$2"{d}"
                     }
                   };
                   END {P()}'
    
    Change-Id: I56ca098faa5fe8d1e3f712dc0a029a3f10559d99
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5617
    Reviewed-by: Andreas Fritiofson <and...@gm...>
    Tested-by: jenkins

diff --git a/src/flash/nand/mx3.c b/src/flash/nand/mx3.c
index 5fdc92305..da141b742 100644
--- a/src/flash/nand/mx3.c
+++ b/src/flash/nand/mx3.c
@@ -685,7 +685,6 @@ static int do_data_output(struct nand_device *nand)
 				case 2 << 2:
 					LOG_DEBUG("main area readed with more than 1 (incorrectable) error");
 					return ERROR_NAND_OPERATION_FAILED;
-					break;
 				}
 				switch (ecc_status & 0x0003) {
 				case 1:
@@ -694,7 +693,6 @@ static int do_data_output(struct nand_device *nand)
 				case 2:
 					LOG_DEBUG("main area readed with more than 1 (incorrectable) error");
 					return ERROR_NAND_OPERATION_FAILED;
-					break;
 				}
 			}
 			break;
diff --git a/src/flash/nand/mxc.c b/src/flash/nand/mxc.c
index b54115731..ee093c056 100644
--- a/src/flash/nand/mxc.c
+++ b/src/flash/nand/mxc.c
@@ -874,7 +874,6 @@ int ecc_status_v1(struct nand_device *nand)
 		case 2 << 2:
 			LOG_INFO("main area read with more than 1 (incorrectable) error");
 			return ERROR_NAND_OPERATION_FAILED;
-			break;
 	}
 	switch (ecc_status & 0x0003) {
 		case 1:
@@ -883,7 +882,6 @@ int ecc_status_v1(struct nand_device *nand)
 		case 2:
 			LOG_INFO("main area read with more than 1 (incorrectable) error");
 			return ERROR_NAND_OPERATION_FAILED;
-			break;
 	}
 	return ERROR_OK;
 }
diff --git a/src/flash/nor/aducm360.c b/src/flash/nor/aducm360.c
index f468c89a5..7c5596d48 100644
--- a/src/flash/nor/aducm360.c
+++ b/src/flash/nor/aducm360.c
@@ -434,10 +434,8 @@ static int aducm360_write_block(struct flash_bank *bank,
 	switch (choice) {
 	case 0:
 		return aducm360_write_block_sync(bank, buffer, offset, count);
-		break;
 	case 1:
 		return aducm360_write_block_async(bank, buffer, offset, count);
-		break;
 	default:
 		LOG_ERROR("aducm360_write_block was cancelled (no writing method was chosen)!");
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index af0b50b49..b51e0972a 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -3068,7 +3068,6 @@ FLASH_BANK_COMMAND_HANDLER(sam3_flash_bank_command)
 		    ((unsigned int)(FLASH_BANK1_BASE_256K_AX)),
 		    ((unsigned int)(FLASH_BANK1_BASE_512K_AX)));
 			return ERROR_FAIL;
-			break;
 
 		/* at91sam3s and at91sam3n series only has bank 0*/
 		/* at91sam3u and at91sam3ax series has the same address for bank 0*/
@@ -3621,10 +3620,8 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
 	switch (CMD_ARGC) {
 		default:
 			return ERROR_COMMAND_SYNTAX_ERROR;
-			break;
 		case 0:
 			goto showall;
-			break;
 		case 1:
 			who = -1;
 			break;
@@ -3708,7 +3705,6 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
 			/* error */
 			command_print(CMD, "Too many parameters");
 			return ERROR_COMMAND_SYNTAX_ERROR;
-			break;
 	}
 	command_print(CMD, "Slowclk freq: %d.%03dkhz",
 		(int)(pChip->cfg.slow_freq / 1000),
diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index 621754c90..135fc99bf 100644
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -2482,7 +2482,6 @@ FLASH_BANK_COMMAND_HANDLER(sam4_flash_bank_command)
 				((unsigned int)(bank->base)),
 				((unsigned int)(FLASH_BANK_BASE_S)));
 			return ERROR_FAIL;
-			break;
 
 		/* at91sam4s series only has bank 0*/
 		/* at91sam4sd series has the same address for bank 0 (FLASH_BANK0_BASE_SD)*/
@@ -3101,10 +3100,8 @@ COMMAND_HANDLER(sam4_handle_gpnvm_command)
 	switch (CMD_ARGC) {
 		default:
 			return ERROR_COMMAND_SYNTAX_ERROR;
-			break;
 		case 0:
 			goto showall;
-			break;
 		case 1:
 			who = -1;
 			break;
@@ -3188,7 +3185,6 @@ COMMAND_HANDLER(sam4_handle_slowclk_command)
 			/* error */
 			command_print(CMD, "Too many parameters");
 			return ERROR_COMMAND_SYNTAX_ERROR;
-			break;
 	}
 	command_print(CMD, "Slowclk freq: %d.%03dkhz",
 		(int)(pChip->cfg.slow_freq / 1000),
diff --git a/src/flash/nor/atsamv.c b/src/flash/nor/atsamv.c
index d6f1a0a48..9a53369a7 100644
--- a/src/flash/nor/atsamv.c
+++ b/src/flash/nor/atsamv.c
@@ -375,7 +375,6 @@ static int samv_probe(struct flash_bank *bank)
 		default:
 			LOG_ERROR("unrecognized flash size code: %d", nvm_size_code);
 			return ERROR_FAIL;
-			break;
 	}
 
 	struct samv_flash_bank *samv_info = bank->driver_priv;
@@ -645,7 +644,6 @@ COMMAND_HANDLER(samv_handle_gpnvm_command)
 	switch (CMD_ARGC) {
 		case 0:
 			goto showall;
-			break;
 		case 1:
 			who = -1;
 			break;
@@ -660,7 +658,6 @@ COMMAND_HANDLER(samv_handle_gpnvm_command)
 			break;
 		default:
 			return ERROR_COMMAND_SYNTAX_ERROR;
-			break;
 	}
 
 	uint32_t v;
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 80a0a33ee..73884b786 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -989,10 +989,8 @@ int cfi_erase(struct flash_bank *bank, int first, int last)
 		case 1:
 		case 3:
 			return cfi_intel_erase(bank, first, last);
-			break;
 		case 2:
 			return cfi_spansion_erase(bank, first, last);
-			break;
 		default:
 			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
 			break;
@@ -1128,7 +1126,6 @@ int cfi_protect(struct flash_bank *bank, int set, int first, int last)
 		case 1:
 		case 3:
 			return cfi_intel_protect(bank, set, first, last);
-			break;
 		default:
 			LOG_WARNING("protect: cfi primary command set %i unsupported", cfi_info->pri_id);
 			return ERROR_OK;
@@ -1144,13 +1141,10 @@ static uint32_t cfi_command_val(struct flash_bank *bank, uint8_t cmd)
 	switch (bank->bus_width) {
 		case 1:
 			return buf[0];
-			break;
 		case 2:
 			return target_buffer_get_u16(target, buf);
-			break;
 		case 4:
 			return target_buffer_get_u32(target, buf);
-			break;
 		default:
 			LOG_ERROR("Unsupported bank buswidth %d, can't do block memory writes",
 					bank->bus_width);
@@ -2222,10 +2216,8 @@ int cfi_write_word(struct flash_bank *bank, uint8_t *word, uint32_t address)
 		case 1:
 		case 3:
 			return cfi_intel_write_word(bank, word, address);
-			break;
 		case 2:
 			return cfi_spansion_write_word(bank, word, address);
-			break;
 		default:
 			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
 			break;
@@ -2249,10 +2241,8 @@ static int cfi_write_words(struct flash_bank *bank, const uint8_t *word,
 		case 1:
 		case 3:
 			return cfi_intel_write_words(bank, word, wordcount, address);
-			break;
 		case 2:
 			return cfi_spansion_write_words(bank, word, wordcount, address);
-			break;
 		default:
 			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
 			break;
@@ -2998,10 +2988,8 @@ int cfi_protect_check(struct flash_bank *bank)
 		case 1:
 		case 3:
 			return cfi_intel_protect_check(bank);
-			break;
 		case 2:
 			return cfi_spansion_protect_check(bank);
-			break;
 		default:
 			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
 			break;
diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c
index 3cdfcc424..a8f8d3f08 100644
--- a/src/flash/nor/psoc6.c
+++ b/src/flash/nor/psoc6.c
@@ -481,20 +481,15 @@ static const char *protection_to_str(uint8_t protection)
 	switch (protection) {
 		case PROTECTION_VIRGIN:
 			return "VIRGIN";
-			break;
 		case PROTECTION_NORMAL:
 			return "NORMAL";
-			break;
 		case PROTECTION_SECURE:
 			return "SECURE";
-			break;
 		case PROTECTION_DEAD:
 			return "DEAD";
-			break;
 		case PROTECTION_UNKNOWN:
 		default:
 			return "UNKNOWN";
-			break;
 	}
 }
 
diff --git a/src/flash/nor/xcf.c b/src/flash/nor/xcf.c
index a0c35c5e5..ba35c2c10 100644
--- a/src/flash/nor/xcf.c
+++ b/src/flash/nor/xcf.c
@@ -625,7 +625,6 @@ static int xcf_probe(struct flash_bank *bank)
 		default:
 			LOG_ERROR("Unknown flash device ID 0x%X", id);
 			return ERROR_FAIL;
-			break;
 	}
 
 	bank->sectors = malloc(bank->num_sectors * sizeof(struct flash_sector));
diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index a905576c8..14bac2a2f 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -2677,7 +2677,6 @@ static int stlink_speed(void *handle, int khz, bool query)
 	switch (h->transport) {
 	case HL_TRANSPORT_SWIM:
 		return stlink_speed_swim(handle, khz, query);
-		break;
 	case HL_TRANSPORT_SWD:
 		if (h->version.jtag_api == STLINK_JTAG_API_V3)
 			return stlink_speed_v3(handle, false, khz, query);
diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c
index c6683abda..242c04fe3 100644
--- a/src/jtag/drivers/ulink.c
+++ b/src/jtag/drivers/ulink.c
@@ -765,58 +765,40 @@ static const char *ulink_cmd_id_string(uint8_t id)
 	switch (id) {
 	case CMD_SCAN_IN:
 		return "CMD_SCAN_IN";
-		break;
 	case CMD_SLOW_SCAN_IN:
 		return "CMD_SLOW_SCAN_IN";
-		break;
 	case CMD_SCAN_OUT:
 		return "CMD_SCAN_OUT";
-		break;
 	case CMD_SLOW_SCAN_OUT:
 		return "CMD_SLOW_SCAN_OUT";
-		break;
 	case CMD_SCAN_IO:
 		return "CMD_SCAN_IO";
-		break;
 	case CMD_SLOW_SCAN_IO:
 		return "CMD_SLOW_SCAN_IO";
-		break;
 	case CMD_CLOCK_TMS:
 		return "CMD_CLOCK_TMS";
-		break;
 	case CMD_SLOW_CLOCK_TMS:
 		return "CMD_SLOW_CLOCK_TMS";
-		break;
 	case CMD_CLOCK_TCK:
 		return "CMD_CLOCK_TCK";
-		break;
 	case CMD_SLOW_CLOCK_TCK:
 		return "CMD_SLOW_CLOCK_TCK";
-		break;
 	case CMD_SLEEP_US:
 		return "CMD_SLEEP_US";
-		break;
 	case CMD_SLEEP_MS:
 		return "CMD_SLEEP_MS";
-		break;
 	case CMD_GET_SIGNALS:
 		return "CMD_GET_SIGNALS";
-		break;
 	case CMD_SET_SIGNALS:
 		return "CMD_SET_SIGNALS";
-		break;
 	case CMD_CONFIGURE_TCK_FREQ:
 		return "CMD_CONFIGURE_TCK_FREQ";
-		break;
 	case CMD_SET_LEDS:
 		return "CMD_SET_LEDS";
-		break;
 	case CMD_TEST:
 		return "CMD_TEST";
-		break;
 	default:
 		return "CMD_UNKNOWN";
-		break;
 	}
 }
 
diff --git a/src/svf/svf.c b/src/svf/svf.c
index 5d87c8944..54fc7d139 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -1310,7 +1310,6 @@ XXR_common:
 		case PIOMAP:
 			LOG_ERROR("PIO and PIOMAP are not supported");
 			return ERROR_FAIL;
-			break;
 		case RUNTEST:
 			/* RUNTEST [run_state] run_count run_clk [min_time SEC [MAXIMUM max_time
 			 * SEC]] [ENDSTATE end_state] */
@@ -1532,7 +1531,6 @@ XXR_common:
 		default:
 			LOG_ERROR("invalid svf command: %s", argus[0]);
 			return ERROR_FAIL;
-			break;
 	}
 
 	if (!svf_quiet) {
diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index 8eb819446..04c392296 100644
--- a/src/target/arm_disassembler.c
+++ b/src/target/arm_disassembler.c
@@ -2309,7 +2309,6 @@ static int evaluate_data_proc_thumb(uint16_t opcode,
 							address, opcode);
 				}
 				return ERROR_OK;
-				break;
 		}
 	} else {
 		switch (op) {
diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index f5dd22d8b..a01339c1f 100644
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -212,7 +212,6 @@ int arm_dpm_read_reg(struct arm_dpm *dpm, struct reg *r, unsigned regnum)
 			break;
 		case ARM_VFP_V3_D0 ... ARM_VFP_V3_D31:
 			return dpm_read_reg_u64(dpm, r, regnum);
-			break;
 		case ARM_VFP_V3_FPSCR:
 			/* "VMRS r0, FPSCR"; then return via DCC */
 			retval = dpm->instr_read_data_r0(dpm,
@@ -294,7 +293,6 @@ static int dpm_write_reg(struct arm_dpm *dpm, struct reg *r, unsigned regnum)
 			break;
 		case ARM_VFP_V3_D0 ... ARM_VFP_V3_D31:
 			return dpm_write_reg_u64(dpm, r, regnum);
-			break;
 		case ARM_VFP_V3_FPSCR:
 			/* move to r0 from DCC, then "VMSR FPSCR, r0" */
 			retval = dpm->instr_write_data_r0(dpm,
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index a0983cd54..b4581d5f1 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -1223,7 +1223,6 @@ int arm_get_gdb_reg_list(struct target *target,
 		(*reg_list)[25] = arm->cpsr;
 
 		return ERROR_OK;
-		break;
 
 	case REG_CLASS_ALL:
 		switch (arm->core_type) {
@@ -1273,12 +1272,10 @@ int arm_get_gdb_reg_list(struct target *target,
 		}
 
 		return ERROR_OK;
-		break;
 
 	default:
 		LOG_ERROR("not a valid register class type in query.");
 		return ERROR_FAIL;
-		break;
 	}
 }
 
diff --git a/src/target/avr32_ap7k.c b/src/target/avr32_ap7k.c
index cf08e3ab9..622105913 100644
--- a/src/target/avr32_ap7k.c
+++ b/src/target/avr32_ap7k.c
@@ -464,7 +464,6 @@ static int avr32_ap7k_read_memory(struct target *target, target_addr_t address,
 			break;
 		case 1:
 			return avr32_jtag_read_memory8(&ap7k->jtag, address, count, buffer);
-			break;
 		default:
 			break;
 	}
@@ -505,7 +504,6 @@ static int avr32_ap7k_write_memory(struct target *target, target_addr_t address,
 			break;
 		case 1:
 			return avr32_jtag_write_memory8(&ap7k->jtag, address, count, buffer);
-			break;
 		default:
 			break;
 	}
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 8307b0224..e30294114 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -666,10 +666,8 @@ uint32_t abstract_register_size(unsigned width)
 			return set_field(0, AC_ACCESS_REGISTER_SIZE, 2);
 		case 64:
 			return set_field(0, AC_ACCESS_REGISTER_SIZE, 3);
-			break;
 		case 128:
 			return set_field(0, AC_ACCESS_REGISTER_SIZE, 4);
-			break;
 		default:
 			LOG_ERROR("Unsupported register width: %d", width);
 			return 0;
diff --git a/src/transport/transport.c b/src/transport/transport.c
index 77db9e210..010ea7c44 100644
--- a/src/transport/transport.c
+++ b/src/transport/transport.c
@@ -290,7 +290,6 @@ static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj * const *a
 			}
 			Jim_SetResultString(interp, session->name, -1);
 			return JIM_OK;
-			break;
 		case 2:	/* assign */
 			if (session) {
 				if (!strcmp(session->name, argv[1]->bytes)) {
@@ -327,7 +326,6 @@ static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj * const *a
 
 			LOG_ERROR("Debug adapter doesn't support '%s' transport", argv[1]->bytes);
 			return JIM_ERR;
-			break;
 		default:
 			Jim_WrongNumArgs(interp, 1, argv, "[too many parameters]");
 			return JIM_ERR;

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nand/davinci.c                           |  2 +-
 src/flash/nand/mx3.c                               |  2 --
 src/flash/nand/mxc.c                               |  2 --
 src/flash/nor/aducm360.c                           |  2 --
 src/flash/nor/at91sam3.c                           |  4 ----
 src/flash/nor/at91sam4.c                           |  4 ----
 src/flash/nor/atsamv.c                             |  3 ---
 src/flash/nor/cfi.c                                | 14 +----------
 src/flash/nor/fespi.c                              |  2 +-
 src/flash/nor/kinetis_ke.c                         |  2 +-
 src/flash/nor/lpcspifi.c                           | 16 ++++++-------
 src/flash/nor/mrvlqspi.c                           | 10 ++++----
 src/flash/nor/psoc6.c                              |  5 ----
 src/flash/nor/tcl.c                                |  2 +-
 src/flash/nor/xcf.c                                |  1 -
 src/jtag/aice/aice_transport.c                     |  4 ++--
 src/jtag/core.c                                    |  2 +-
 src/jtag/drivers/amt_jtagaccel.c                   |  2 +-
 src/jtag/drivers/arm-jtag-ew.c                     | 16 ++++++-------
 src/jtag/drivers/gw16012.c                         |  2 +-
 src/jtag/drivers/jlink.c                           |  2 +-
 src/jtag/drivers/kitprog.c                         |  6 ++---
 src/jtag/drivers/opendous.c                        |  8 +++----
 src/jtag/drivers/parport.c                         |  2 +-
 src/jtag/drivers/stlink_usb.c                      |  7 +++---
 src/jtag/drivers/ulink.c                           | 18 --------------
 .../drivers/usb_blaster/ublast2_access_libusb.c    | 12 +++++-----
 src/jtag/drivers/usb_blaster/usb_blaster.c         |  4 ++--
 src/jtag/drivers/usbprog.c                         |  2 +-
 src/jtag/drivers/versaloon/versaloon_internal.h    |  2 +-
 src/jtag/drivers/vsllink.c                         |  2 +-
 src/jtag/minidummy/minidummy.c                     |  2 +-
 src/jtag/tcl.c                                     |  4 ++--
 src/rtos/linux.c                                   |  4 ++--
 src/server/gdb_server.c                            |  8 +++----
 src/svf/svf.c                                      | 10 ++++----
 src/target/arc_cmd.c                               | 28 +++++++++++-----------
 src/target/arm11.c                                 |  2 +-
 src/target/arm11_dbgtap.c                          |  2 +-
 src/target/arm_disassembler.c                      |  3 +--
 src/target/arm_dpm.c                               |  6 ++---
 src/target/armv4_5.c                               |  3 ---
 src/target/armv8_dpm.c                             |  4 ++--
 src/target/avr32_ap7k.c                   ...
 
[truncated message content]