kdb: Merge identical case statements in kdb_read()
authorDaniel Thompson <daniel.thompson@linaro.org>
Wed, 24 Apr 2024 14:03:37 +0000 (15:03 +0100)
committerDaniel Thompson <daniel.thompson@linaro.org>
Fri, 26 Apr 2024 16:13:30 +0000 (17:13 +0100)
The code that handles case 14 (down) and case 16 (up) has been copy and
pasted despite being byte-for-byte identical. Combine them.

Cc: stable@vger.kernel.org # Not a bug fix but it is needed for later bug fixes
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Justin Stitt <justinstitt@google.com>
Link: https://lore.kernel.org/r/20240424-kgdb_read_refactor-v3-4-f236dbe9828d@linaro.org
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
kernel/debug/kdb/kdb_io.c

index 5fccb46f399e5b6db4b2eeb1417ce3151648c78a..a73779529803f97c790180dea2be5ca558cde887 100644 (file)
@@ -317,6 +317,7 @@ poll_again:
                }
                break;
        case 14: /* Down */
+       case 16: /* Up */
                memset(tmpbuffer, ' ',
                       strlen(kdb_prompt_str) + (lastchar-buffer));
                *(tmpbuffer+strlen(kdb_prompt_str) +
@@ -331,15 +332,6 @@ poll_again:
                        ++cp;
                }
                break;
-       case 16: /* Up */
-               memset(tmpbuffer, ' ',
-                      strlen(kdb_prompt_str) + (lastchar-buffer));
-               *(tmpbuffer+strlen(kdb_prompt_str) +
-                 (lastchar-buffer)) = '\0';
-               kdb_printf("\r%s\r", tmpbuffer);
-               *lastchar = (char)key;
-               *(lastchar+1) = '\0';
-               return lastchar;
        case 9: /* Tab */
                if (tab < 2)
                        ++tab;