[PATCH 12/31] swim: Simplify return value initialization
From: Finn Thain
Date: Thu Jul 16 2026 - 06:20:13 EST
Initialize the error result once only. Update the result only after a
successful read.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxx>
---
drivers/block/swim_asm.S | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S
index 208622ac4aeb..31fc63b074dc 100644
--- a/drivers/block/swim_asm.S
+++ b/drivers/block/swim_asm.S
@@ -47,6 +47,7 @@ swim_read_sector_header:
link %a6, #0
moveml %d1-%d5/%a0-%a4,%sp@-
movel %a6@(0x0c), %a4
+ moveq #-1, %d0
bsr mfm_read_addrmark
moveml %sp@+, %d1-%d5/%a0-%a4
unlk %a6
@@ -61,7 +62,6 @@ mfm_read_addrmark:
movel %a6@(0x08), %a3
lea %a3@(read_handshake), %a2
lea %a3@(read_mark), %a3
- moveq #-1, %d0
movew #seek_time, %d2
wait_header_init:
@@ -137,10 +137,7 @@ crc1: tstb %a2@
tstb %a3@(read_error - read_mark)
moveq #0, %d0
- moveb #0x18, %a3@(write_mode0 - read_mark)
- rts
signal_nonyb:
- moveq #-1, %d0
moveb #0x18, %a3@(write_mode0 - read_mark)
rts
@@ -149,6 +146,7 @@ swim_read_sector_data:
link %a6, #0
moveml %d1-%d5/%a0-%a5,%sp@-
movel %a6@(0x0c), %a4
+ moveq #-1, %d0
bsr mfm_read_data
moveml %sp@+, %d1-%d5/%a0-%a5
unlk %a6
@@ -228,15 +226,12 @@ data_crc1:
tstb %a3@(read_error - read_mark)
- moveb #0x18, %a3@(write_mode0 - read_mark)
-
/* return number of bytes read */
movel #sector_size, %d0
addw #1, %d4
subl %d4, %d0
- rts
+
data_exit:
moveb #0x18, %a3@(write_mode0 - read_mark)
- moveq #-1, %d0
rts
--
2.52.0