]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
m68k: Remove unused "cursor home" code from debug console
authorFinn Thain <fthain@linux-m68k.org>
Thu, 27 Mar 2025 22:39:55 +0000 (09:39 +1100)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 6 Jul 2025 10:50:50 +0000 (12:50 +0200)
The cursor home operation is unused and seems undesirable for logging.
Remove it. The console_not_cr label actually means "not line feed and
not carriage return either" so take the opportunity to replace it with
something less confusing. Rectify some inconsistent whitespace while
we're here.

Signed-off-by: Finn Thain <fthain@linux-m68k.org>
Tested-by: Stan Johnson <userm57@yahoo.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/ec2d443d3c3213028bbbab7c2e0382cd53db75fe.1743115195.git.fthain@linux-m68k.org
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/kernel/head.S

index 49e079b0d0b5a8b6298e3a854bdd9cff85c74c60..6465333d5f7c05a3fddfba454c6a33886c8bf195 100644 (file)
@@ -3555,28 +3555,21 @@ func_start      console_putc,%a0/%a1/%d0-%d7
        jra     L(console_exit)
 
 L(console_not_lf):
-       cmpib   #13,%d7
-       jne     L(console_not_cr)
+       cmpib   #'\r',%d7
+       jne     L(console_not_lf_not_cr)
        clrl    %a0@(Lconsole_struct_cur_column)
        jra     L(console_exit)
 
-L(console_not_cr):
-       cmpib   #1,%d7
-       jne     L(console_not_home)
-       clrl    %a0@(Lconsole_struct_cur_row)
-       clrl    %a0@(Lconsole_struct_cur_column)
-       jra     L(console_exit)
-
-/*
- *     At this point we know that the %d7 character is going to be
- *     rendered on the screen.  Register usage is -
- *             a0 = pointer to console globals
- *             a1 = font data
- *             d0 = cursor column
- *             d1 = cursor row to draw the character
- *             d7 = character number
- */
-L(console_not_home):
+       /*
+        *      At this point we know that the %d7 character is going to be
+        *      rendered on the screen.  Register usage is -
+        *      a0 = pointer to console globals
+        *      a1 = font data
+        *      d0 = cursor column
+        *      d1 = cursor row to draw the character
+        *      d7 = character number
+        */
+L(console_not_lf_not_cr):
        movel   %a0@(Lconsole_struct_cur_column),%d0
        movel   %a0@(Lconsole_struct_cur_row),%d1