From bd275ef48352beeb8099225ee4eb09407a25ddf8 Mon Sep 17 00:00:00 2001
From: Jan Matyas <jan.matyas@codasip.com>
Date: Mon, 15 May 2023 15:03:49 +0200
Subject: [PATCH] Minor cleanup in target.c

Small cleanup in target.c to get rid of few upstream differences:

- removed a pointless check for `reg->exists` - already checked
  few lines above
- unify one log message with what's in upstream

Change-Id: I3fd761157382670611fa90de84e2dfc90192f473
Signed-off-by: Jan Matyas <jan.matyas@codasip.com>
---
 src/target/target.c | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/target/target.c b/src/target/target.c
index f09c9a501..b9bcf24c5 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -3107,23 +3107,21 @@ COMMAND_HANDLER(handle_reg_command)
 				if (reg->exist == false || reg->hidden)
 					continue;
 				/* only print cached values if they are valid */
-				if (reg->exist) {
-					if (reg->valid) {
-						char *value = buf_to_hex_str(reg->value,
-								reg->size);
-						command_print(CMD,
-								"(%i) %s (/%" PRIu32 "): 0x%s%s",
-								count, reg->name,
-								reg->size, value,
-								reg->dirty
-								? " (dirty)"
-								: "");
-						free(value);
-					} else {
-						command_print(CMD, "(%i) %s (/%" PRIu32 ")",
-								count, reg->name,
-								reg->size) ;
-					}
+				if (reg->valid) {
+					char *value = buf_to_hex_str(reg->value,
+							reg->size);
+					command_print(CMD,
+							"(%i) %s (/%" PRIu32 "): 0x%s%s",
+							count, reg->name,
+							reg->size, value,
+							reg->dirty
+							? " (dirty)"
+							: "");
+					free(value);
+				} else {
+					command_print(CMD, "(%i) %s (/%" PRIu32 ")",
+							count, reg->name,
+							reg->size);
 				}
 			}
 			cache = cache->next;
@@ -3179,8 +3177,8 @@ COMMAND_HANDLER(handle_reg_command)
 		if (reg->valid == 0) {
 			int retval = reg->type->get(reg);
 			if (retval != ERROR_OK) {
-			    LOG_DEBUG("Couldn't get register %s.", reg->name);
-			    return retval;
+				LOG_ERROR("Could not read register '%s'", reg->name);
+				return retval;
 			}
 		}
 		char *value = buf_to_hex_str(reg->value, reg->size);