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 <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5617
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Tested-by: jenkins

diff --git a/src/flash/nand/mx3.c b/src/flash/nand/mx3.c
index 5fdc923056c96ec875208297d4c9ba7f5f0e9553..da141b7423db199bcec0fcb588b684172e419fb8 100644 (file)
--- 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;
                                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:
                                }
                                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;
                                case 2:
                                        LOG_DEBUG("main area readed with more than 1 (incorrectable) error");
                                        return ERROR_NAND_OPERATION_FAILED;

-                                       break;

                                }
                        }
                        break;
                                }
                        }
                        break;

diff --git a/src/flash/nand/mxc.c b/src/flash/nand/mxc.c
index b54115731b8d6f78baa3fd58414674c23ce2a6d2..ee093c056df47c644b76d368728c904d791dd36f 100644 (file)
--- 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;
                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:
        }
        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;
                case 2:
                        LOG_INFO("main area read with more than 1 (incorrectable) error");
                        return ERROR_NAND_OPERATION_FAILED;

-                       break;

        }
        return ERROR_OK;
 }
        }
        return ERROR_OK;
 }

diff --git a/src/flash/nor/aducm360.c b/src/flash/nor/aducm360.c
index f468c89a53efb2e48a60ed14e17a6f2d986b43b0..7c5596d48dc7b54cc03e9f0e14d98494f6ad4411 100644 (file)
--- 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);
        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);
        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;
        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 af0b50b49a35703e42abd1cfb466035e73b3acc9..b51e0972a65aa864d5884e76bd1bd5998831f651 100644 (file)
--- 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;
                    ((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*/
 
                /* 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;
        switch (CMD_ARGC) {
                default:
                        return ERROR_COMMAND_SYNTAX_ERROR;

-                       break;

                case 0:
                        goto showall;
                case 0:
                        goto showall;

-                       break;

                case 1:
                        who = -1;
                        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;
                        /* 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),
        }
        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 621754c90ec98d1e329c2feca619b002fd9f1785..135fc99bfbf80a38ccea437a7978ce7ec25ad7f0 100644 (file)
--- 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;
                                ((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)*/
 
                /* 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;
        switch (CMD_ARGC) {
                default:
                        return ERROR_COMMAND_SYNTAX_ERROR;

-                       break;

                case 0:
                        goto showall;
                case 0:
                        goto showall;

-                       break;

                case 1:
                        who = -1;
                        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;
                        /* 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),
        }
        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 d6f1a0a48f28d4d079f7f11b7bda96f0e4649a1e..9a53369a79d98d130e3f64c655e565953f360d95 100644 (file)
--- 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;
                default:
                        LOG_ERROR("unrecognized flash size code: %d", nvm_size_code);
                        return ERROR_FAIL;

-                       break;

        }
 
        struct samv_flash_bank *samv_info = bank->driver_priv;
        }
 
        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;
        switch (CMD_ARGC) {
                case 0:
                        goto showall;

-                       break;

                case 1:
                        who = -1;
                        break;
                case 1:
                        who = -1;
                        break;


@@ -660,7 +658,6 @@ COMMAND_HANDLER(samv_handle_gpnvm_command)
                        break;
                default:
                        return ERROR_COMMAND_SYNTAX_ERROR;
                        break;
                default:
                        return ERROR_COMMAND_SYNTAX_ERROR;

-                       break;

        }
 
        uint32_t v;
        }
 
        uint32_t v;

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 80a0a33ee86692799bed80507f0ad357e0427c26..73884b786893b37b3e5a9899fb99a6ae4002c078 100644 (file)
--- 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);
                case 1:
                case 3:
                        return cfi_intel_erase(bank, first, last);

-                       break;

                case 2:
                        return cfi_spansion_erase(bank, first, last);
                case 2:
                        return cfi_spansion_erase(bank, first, last);

-                       break;

                default:
                        LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
                        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);
                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;
                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];
        switch (bank->bus_width) {
                case 1:
                        return buf[0];

-                       break;

                case 2:
                        return target_buffer_get_u16(target, buf);
                case 2:
                        return target_buffer_get_u16(target, buf);

-                       break;

                case 4:
                        return target_buffer_get_u32(target, buf);
                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);
                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);
                case 1:
                case 3:
                        return cfi_intel_write_word(bank, word, address);

-                       break;

                case 2:
                        return cfi_spansion_write_word(bank, word, address);
                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;
                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);
                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);
                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;
                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);
                case 1:
                case 3:
                        return cfi_intel_protect_check(bank);

-                       break;

                case 2:
                        return cfi_spansion_protect_check(bank);
                case 2:
                        return cfi_spansion_protect_check(bank);

-                       break;

                default:
                        LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
                        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 3cdfcc4241ed15351fd81c8b06a8562021e02d19..a8f8d3f0856485fd20b8560c6d382aff2bad7cab 100644 (file)
--- 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";
        switch (protection) {
                case PROTECTION_VIRGIN:
                        return "VIRGIN";

-                       break;

                case PROTECTION_NORMAL:
                        return "NORMAL";
                case PROTECTION_NORMAL:
                        return "NORMAL";

-                       break;

                case PROTECTION_SECURE:
                        return "SECURE";
                case PROTECTION_SECURE:
                        return "SECURE";

-                       break;

                case PROTECTION_DEAD:
                        return "DEAD";
                case PROTECTION_DEAD:
                        return "DEAD";

-                       break;

                case PROTECTION_UNKNOWN:
                default:
                        return "UNKNOWN";
                case PROTECTION_UNKNOWN:
                default:
                        return "UNKNOWN";

-                       break;

        }
 }
 
        }
 }
 

diff --git a/src/flash/nor/xcf.c b/src/flash/nor/xcf.c
index a0c35c5e52ff13080d8885ebf01ddcfdb63f2754..ba35c2c10c5203c3ce57e168764b1a33b13fb958 100644 (file)
--- 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;
                default:
                        LOG_ERROR("Unknown flash device ID 0x%X", id);
                        return ERROR_FAIL;

-                       break;

        }
 
        bank->sectors = malloc(bank->num_sectors * sizeof(struct flash_sector));
        }
 
        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 a905576c89b37c9967a19855af4bd76b58f166fc..14bac2a2f4304924399170a113e0c2672a8e8143 100644 (file)
--- 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);
        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);
        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 c6683abda2bf06c8e47ef478970b69e17f40142b..242c04fe3416b322066a5d1e8aed7f59fedad5c0 100644 (file)
--- 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";
        switch (id) {
        case CMD_SCAN_IN:
                return "CMD_SCAN_IN";

-               break;

        case CMD_SLOW_SCAN_IN:
                return "CMD_SLOW_SCAN_IN";
        case CMD_SLOW_SCAN_IN:
                return "CMD_SLOW_SCAN_IN";

-               break;

        case CMD_SCAN_OUT:
                return "CMD_SCAN_OUT";
        case CMD_SCAN_OUT:
                return "CMD_SCAN_OUT";

-               break;

        case CMD_SLOW_SCAN_OUT:
                return "CMD_SLOW_SCAN_OUT";
        case CMD_SLOW_SCAN_OUT:
                return "CMD_SLOW_SCAN_OUT";

-               break;

        case CMD_SCAN_IO:
                return "CMD_SCAN_IO";
        case CMD_SCAN_IO:
                return "CMD_SCAN_IO";

-               break;

        case CMD_SLOW_SCAN_IO:
                return "CMD_SLOW_SCAN_IO";
        case CMD_SLOW_SCAN_IO:
                return "CMD_SLOW_SCAN_IO";

-               break;

        case CMD_CLOCK_TMS:
                return "CMD_CLOCK_TMS";
        case CMD_CLOCK_TMS:
                return "CMD_CLOCK_TMS";

-               break;

        case CMD_SLOW_CLOCK_TMS:
                return "CMD_SLOW_CLOCK_TMS";
        case CMD_SLOW_CLOCK_TMS:
                return "CMD_SLOW_CLOCK_TMS";

-               break;

        case CMD_CLOCK_TCK:
                return "CMD_CLOCK_TCK";
        case CMD_CLOCK_TCK:
                return "CMD_CLOCK_TCK";

-               break;

        case CMD_SLOW_CLOCK_TCK:
                return "CMD_SLOW_CLOCK_TCK";
        case CMD_SLOW_CLOCK_TCK:
                return "CMD_SLOW_CLOCK_TCK";

-               break;

        case CMD_SLEEP_US:
                return "CMD_SLEEP_US";
        case CMD_SLEEP_US:
                return "CMD_SLEEP_US";

-               break;

        case CMD_SLEEP_MS:
                return "CMD_SLEEP_MS";
        case CMD_SLEEP_MS:
                return "CMD_SLEEP_MS";

-               break;

        case CMD_GET_SIGNALS:
                return "CMD_GET_SIGNALS";
        case CMD_GET_SIGNALS:
                return "CMD_GET_SIGNALS";

-               break;

        case CMD_SET_SIGNALS:
                return "CMD_SET_SIGNALS";
        case CMD_SET_SIGNALS:
                return "CMD_SET_SIGNALS";

-               break;

        case CMD_CONFIGURE_TCK_FREQ:
                return "CMD_CONFIGURE_TCK_FREQ";
        case CMD_CONFIGURE_TCK_FREQ:
                return "CMD_CONFIGURE_TCK_FREQ";

-               break;

        case CMD_SET_LEDS:
                return "CMD_SET_LEDS";
        case CMD_SET_LEDS:
                return "CMD_SET_LEDS";

-               break;

        case CMD_TEST:
                return "CMD_TEST";
        case CMD_TEST:
                return "CMD_TEST";

-               break;

        default:
                return "CMD_UNKNOWN";
        default:
                return "CMD_UNKNOWN";

-               break;

        }
 }
 
        }
 }
 

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 5d87c894490e11165b5dc0c3f403c5c9da0e4da8..54fc7d1399cb318b2d9752ac0bdf22ffe18ca1a8 100644 (file)
--- 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;
                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] */
                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;
                default:
                        LOG_ERROR("invalid svf command: %s", argus[0]);
                        return ERROR_FAIL;

-                       break;

        }
 
        if (!svf_quiet) {
        }
 
        if (!svf_quiet) {

diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index 8eb819446b545c1d163bd135cab299490982d4e7..04c3922963c3d1b4d420e0122642b856735a0075 100644 (file)
--- 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;
                                                        address, opcode);
                                }
                                return ERROR_OK;

-                               break;

                }
        } else {
                switch (op) {
                }
        } else {
                switch (op) {

diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index f5dd22d8b31677a57f8c8bb414e501c65e918443..a01339c1f9bf7708cd9c6582fe08628cd9e1141a 100644 (file)
--- 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_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,
                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_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,
                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 a0983cd54cd95fa38fda752a76829a20701611bb..b4581d5f1731b15acba2f7fc44e1634824a10921 100644 (file)
--- 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;
                (*reg_list)[25] = arm->cpsr;
 
                return ERROR_OK;

-               break;

 
        case REG_CLASS_ALL:
                switch (arm->core_type) {
 
        case REG_CLASS_ALL:
                switch (arm->core_type) {


@@ -1273,12 +1272,10 @@ int arm_get_gdb_reg_list(struct target *target,
                }
 
                return ERROR_OK;
                }
 
                return ERROR_OK;

-               break;

 
        default:
                LOG_ERROR("not a valid register class type in query.");
                return ERROR_FAIL;
 
        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 cf08e3ab9cf0d9428f8b82f47d843961bab2418a..62210591300455a3b03b66dc0ac37416f72e58c6 100644 (file)
--- 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;
                case 1:
                        return avr32_jtag_read_memory8(&ap7k->jtag, address, count, buffer);

-                       break;

                default:
                        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;
                case 1:
                        return avr32_jtag_write_memory8(&ap7k->jtag, address, count, buffer);

-                       break;

                default:
                        break;
        }
                default:
                        break;
        }

diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 8307b0224bf5eb587529e3505c29850a7488d2ce..e30294114b3413035737479bf979d422c0652411 100644 (file)
--- 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);
                        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);
                case 128:
                        return set_field(0, AC_ACCESS_REGISTER_SIZE, 4);

-                       break;

                default:
                        LOG_ERROR("Unsupported register width: %d", width);
                        return 0;
                default:
                        LOG_ERROR("Unsupported register width: %d", width);
                        return 0;

diff --git a/src/transport/transport.c b/src/transport/transport.c
index 77db9e21099f81eeaf19b1c09518959b824385be..010ea7c44deff21d64e1d1c085a915dfbb1357a5 100644 (file)
--- 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;
                        }
                        Jim_SetResultString(interp, session->name, -1);
                        return JIM_OK;

-                       break;

                case 2: /* assign */
                        if (session) {
                                if (!strcmp(session->name, argv[1]->bytes)) {
                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;
 
                        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;
                default:
                        Jim_WrongNumArgs(interp, 1, argv, "[too many parameters]");
                        return JIM_ERR;