]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
firewire: ohci: minor code refactoring to localize text table
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Mon, 29 Jul 2024 13:46:30 +0000 (22:46 +0900)
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>
Mon, 29 Jul 2024 13:46:30 +0000 (22:46 +0900)
The string table for tcode is just used by log_ar_at_event(). In the case,
it is suitable to move the table inner the function definition.

This commit is for the purpose. Additionally, the hard-coded value for
tcode is replaced with defined macros as many as possible.

Link: https://lore.kernel.org/r/20240729134631.127189-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
drivers/firewire/ohci.c

index c3fff94b13e54c0de37022aacd958bc0ceb7e119..a0bb0e87e18a2067f27848595c1fce0880cf42e6 100644 (file)
@@ -531,20 +531,28 @@ static const char *evts[] = {
        [0x1e] = "ack_type_error",      [0x1f] = "-reserved-",
        [0x20] = "pending/cancelled",
 };
-static const char *tcodes[] = {
-       [0x0] = "QW req",               [0x1] = "BW req",
-       [0x2] = "W resp",               [0x3] = "-reserved-",
-       [0x4] = "QR req",               [0x5] = "BR req",
-       [0x6] = "QR resp",              [0x7] = "BR resp",
-       [0x8] = "cycle start",          [0x9] = "Lk req",
-       [0xa] = "async stream packet",  [0xb] = "Lk resp",
-       [0xc] = "-reserved-",           [0xd] = "-reserved-",
-       [0xe] = "link internal",        [0xf] = "-reserved-",
-};
 
 static void log_ar_at_event(struct fw_ohci *ohci,
                            char dir, int speed, u32 *header, int evt)
 {
+       static const char *const tcodes[] = {
+               [TCODE_WRITE_QUADLET_REQUEST]   = "QW req",
+               [TCODE_WRITE_BLOCK_REQUEST]     = "BW req",
+               [TCODE_WRITE_RESPONSE]          = "W resp",
+               [0x3]                           = "-reserved-",
+               [TCODE_READ_QUADLET_REQUEST]    = "QR req",
+               [TCODE_READ_BLOCK_REQUEST]      = "BR req",
+               [TCODE_READ_QUADLET_RESPONSE]   = "QR resp",
+               [TCODE_READ_BLOCK_RESPONSE]     = "BR resp",
+               [TCODE_CYCLE_START]             = "cycle start",
+               [TCODE_LOCK_REQUEST]            = "Lk req",
+               [TCODE_STREAM_DATA]             = "async stream packet",
+               [TCODE_LOCK_RESPONSE]           = "Lk resp",
+               [0xc]                           = "-reserved-",
+               [0xd]                           = "-reserved-",
+               [TCODE_LINK_INTERNAL]           = "link internal",
+               [0xf]                           = "-reserved-",
+       };
        int tcode = async_header_get_tcode(header);
        char specific[12];