openocd: fix simple cases of NULL comparison

[openocd.git] / src / target / smp.c

diff --git a/src/target/smp.c b/src/target/smp.c
index acd4628e2e92933c3724d3aec1eb588a6a8415da..94c4da5a88510ed8a78e899599ebd7a378e29185 100644 (file)
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -131,26 +131,6 @@ COMMAND_HANDLER(default_handle_smp_command)
        return ERROR_COMMAND_SYNTAX_ERROR;
 }
 
-COMMAND_HANDLER(deprecated_handle_smp_on_command)
-{
-       const char *argv[] = {"on", NULL};
-
-       LOG_WARNING("\'smp_on\' is deprecated, please use \'smp on\' instead.");
-       CMD_ARGC = 1;
-       CMD_ARGV = argv;
-       return CALL_COMMAND_HANDLER(default_handle_smp_command);
-}
-
-COMMAND_HANDLER(deprecated_handle_smp_off_command)
-{
-       const char *argv[] = {"off", NULL};
-
-       LOG_WARNING("\'smp_off\' is deprecated, please use \'smp off\' instead.");
-       CMD_ARGC = 1;
-       CMD_ARGV = argv;
-       return CALL_COMMAND_HANDLER(default_handle_smp_command);
-}
-
 COMMAND_HANDLER(handle_smp_gdb_command)
 {
        struct target *target = get_current_target(CMD_CTX);
@@ -161,7 +141,7 @@ COMMAND_HANDLER(handle_smp_gdb_command)
                if (CMD_ARGC == 1) {
                        int coreid = 0;
                        COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
-                       if (ERROR_OK != retval)
+                       if (retval != ERROR_OK)
                                return retval;
                        target->gdb_service->core[1] = coreid;
 
@@ -180,20 +160,6 @@ const struct command_registration smp_command_handlers[] = {
                .help = "smp handling",
                .usage = "[on|off]",
        },
-       {
-               .name = "smp_on",
-               .handler = deprecated_handle_smp_on_command,
-               .mode = COMMAND_EXEC,
-               .help = "Restart smp handling",
-               .usage = "",
-       },
-       {
-               .name = "smp_off",
-               .handler = deprecated_handle_smp_off_command,
-               .mode = COMMAND_EXEC,
-               .help = "Stop smp handling",
-               .usage = "",
-       },
        {
                .name = "smp_gdb",
                .handler = handle_smp_gdb_command,