openocd: manually fix Yoda conditions

[fw/openocd] / src / target / etm_dummy.c

diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index 647774f24de170bb5424c32e5f7d3b17565da649..ba53c7a828d3d334d5478c2a88073f020bc494c9 100644 (file)
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -13,18 +13,16 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "armv4_5.h"
+#include "arm.h"
 #include "etm_dummy.h"
 
-
 COMMAND_HANDLER(handle_etm_dummy_config_command)
 {
        struct target *target;
@@ -32,25 +30,20 @@ COMMAND_HANDLER(handle_etm_dummy_config_command)
 
        target = get_target(CMD_ARGV[0]);
 
-       if (!target)
-       {
+       if (!target) {
                LOG_ERROR("target '%s' not defined", CMD_ARGV[0]);
                return ERROR_FAIL;
        }
 
        arm = target_to_arm(target);
-       if (!is_arm(arm))
-       {
-               command_print(CMD_CTX, "target '%s' isn't an ARM", CMD_ARGV[0]);
+       if (!is_arm(arm)) {
+               command_print(CMD, "target '%s' isn't an ARM", CMD_ARGV[0]);
                return ERROR_FAIL;
        }
 
        if (arm->etm)
-       {
                arm->etm->capture_driver_priv = NULL;
-       }
-       else
-       {
+       else {
                LOG_ERROR("target has no ETM defined, ETM dummy left unconfigured");
                return ERROR_FAIL;
        }
@@ -61,9 +54,9 @@ COMMAND_HANDLER(handle_etm_dummy_config_command)
 static const struct command_registration etm_dummy_config_command_handlers[] = {
        {
                .name = "config",
-               .handler = &handle_etm_dummy_config_command,
+               .handler = handle_etm_dummy_config_command,
                .mode = COMMAND_CONFIG,
-               .usage = "<target>",
+               .usage = "target",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -73,6 +66,7 @@ static const struct command_registration etm_dummy_command_handlers[] = {
                .mode = COMMAND_ANY,
                .help = "Dummy ETM capture driver command group",
                .chain = etm_dummy_config_command_handlers,
+               .usage = "",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -102,8 +96,7 @@ static int etm_dummy_stop_capture(struct etm_context *etm_ctx)
        return ERROR_OK;
 }
 
-struct etm_capture_driver etm_dummy_capture_driver =
-{
+struct etm_capture_driver etm_dummy_capture_driver = {
        .name = "dummy",
        .commands = etm_dummy_command_handlers,
        .init = etm_dummy_init,