Staging: rts5208: Use dev_dbg and print_hex_dump_bytes to dump memory

Use dev_dbg with %*ph format specifier and print_hex_dump_bytes to dump memory
instead of relying on custom macro.

Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c
index 390b1f83ebc214bfe226874f0818707225df41ba..db8e22166db8948ad33a1ebd23f7efeac804e993 100644 (file)
--- a/drivers/staging/rts5208/ms.c
+++ b/drivers/staging/rts5208/ms.c
@@ -305,7 +305,8 @@ static int ms_read_bytes(struct rtsx_chip *chip,
 
        if ((tpc == PRO_READ_SHORT_DATA) && (data_len == 8)) {
                dev_dbg(rtsx_dev(chip), "Read format progress:\n");
-               RTSX_DUMP(ptr, cnt);
+               print_hex_dump_bytes(KBUILD_MODNAME ": ", DUMP_PREFIX_NONE, ptr,
+                                    cnt);
        }
 
        return STATUS_SUCCESS;
@@ -1913,7 +1914,7 @@ RE_SEARCH:
        ptr = rtsx_get_cmd_data(chip);
 
        dev_dbg(rtsx_dev(chip), "Boot block data:\n");
-       RTSX_DUMP(ptr, 16);
+       dev_dbg(rtsx_dev(chip), "%*ph\n", 16, ptr);
 
        /* Block ID error
         * HEADER_ID0, HEADER_ID1

diff --git a/drivers/staging/rts5208/rtsx_chip.c b/drivers/staging/rts5208/rtsx_chip.c
index fe98309b7de64cc03a1b686f587183e2b5939416..1db534aeb12d05bbfe3fbe1fc5e87fdb564c66e6 100644 (file)
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -1309,8 +1309,10 @@ int rtsx_write_cfg_seq(struct rtsx_chip *chip, u8 func, u16 addr, u8 *buf,
                }
        }
 
-       RTSX_DUMP(mask, dw_len * 4);
-       RTSX_DUMP(data, dw_len * 4);
+       print_hex_dump_bytes(KBUILD_MODNAME ": ", DUMP_PREFIX_NONE, mask,
+                            dw_len * 4);
+       print_hex_dump_bytes(KBUILD_MODNAME ": ", DUMP_PREFIX_NONE, data,
+                            dw_len * 4);
 
        for (i = 0; i < dw_len; i++) {
                retval = rtsx_write_cfg_dw(chip, func, aligned_addr + i * 4,

diff --git a/drivers/staging/rts5208/rtsx_scsi.c b/drivers/staging/rts5208/rtsx_scsi.c
index 5f5f512714e5a5aa7c8f032b71ac2297d6b4cefe..7e6c7c043a52f6acfa560a4fc443f4d13b1b9517 100644 (file)
--- a/drivers/staging/rts5208/rtsx_scsi.c
+++ b/drivers/staging/rts5208/rtsx_scsi.c
@@ -39,7 +39,7 @@ void scsi_show_command(struct rtsx_chip *chip)
 {
        struct scsi_cmnd *srb = chip->srb;
        char *what = NULL;
-       int i, unknown_cmd = 0;
+       int unknown_cmd = 0, len;
 
        switch (srb->cmnd[0]) {
        case TEST_UNIT_READY:
@@ -319,9 +319,8 @@ void scsi_show_command(struct rtsx_chip *chip)
                        what, srb->cmd_len);
 
        if (unknown_cmd) {
-               for (i = 0; i < srb->cmd_len && i < 16; i++)
-                       dev_dbg(rtsx_dev(chip), " %02x", srb->cmnd[i]);
-               dev_dbg(rtsx_dev(chip), "\n");
+               len = min_t(unsigned short, srb->cmd_len, 16);
+               dev_dbg(rtsx_dev(chip), "%*ph\n", len, srb->cmnd);
        }
 }
 

diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index c79bea808698f89214a44bde626d2c3e15787604..06c96d52c15d5f04532a52cfdca68fc0572f7b94 100644 (file)
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -427,7 +427,7 @@ static int sd_check_csd(struct rtsx_chip *chip, char check_wp)
        memcpy(sd_card->raw_csd, rsp + 1, 15);
 
        dev_dbg(rtsx_dev(chip), "CSD Response:\n");
-       RTSX_DUMP(sd_card->raw_csd, 16);
+       dev_dbg(rtsx_dev(chip), "%*ph\n", 16, sd_card->raw_csd);
 
        csd_ver = (rsp[1] & 0xc0) >> 6;
        dev_dbg(rtsx_dev(chip), "csd_ver = %d\n", csd_ver);
@@ -1060,7 +1060,7 @@ static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode,
                TRACE_RET(chip, STATUS_FAIL);
        }
 
-       RTSX_DUMP(buf, 64);
+       dev_dbg(rtsx_dev(chip), "%*ph\n", 64, buf);
 
        if (func_group == NO_ARGUMENT) {
                sd_card->func_group1_mask = buf[0x0D];
@@ -2119,7 +2119,7 @@ static int sd_check_wp_state(struct rtsx_chip *chip)
        }
 
        dev_dbg(rtsx_dev(chip), "ACMD13:\n");
-       RTSX_DUMP(buf, 64);
+       dev_dbg(rtsx_dev(chip), "%*ph\n", 64, buf);
 
        sd_card_type = ((u16)buf[2] << 8) | buf[3];
        dev_dbg(rtsx_dev(chip), "sd_card_type = 0x%04x\n", sd_card_type);

diff --git a/drivers/staging/rts5208/trace.h b/drivers/staging/rts5208/trace.h
index fbb304a54acc834d2e5fe77a5f5631b36f92307e..a9ab4077b283eedc7e48b8a638fce0a3c915ec50 100644 (file)
--- a/drivers/staging/rts5208/trace.h
+++ b/drivers/staging/rts5208/trace.h
@@ -84,12 +84,4 @@ static inline char *filename(char *path)
 #define TRACE_GOTO(chip, label)        goto label
 #endif
 
-#ifdef CONFIG_RTS5208_DEBUG
-#define RTSX_DUMP(buf, buf_len)                                        \
-       print_hex_dump(KERN_DEBUG, KBUILD_MODNAME ": ",         \
-                      DUMP_PREFIX_NONE, 16, 1, (buf), (buf_len), false)
-#else
-#define RTSX_DUMP(buf, buf_len)
-#endif
-
 #endif  /* __REALTEK_RTSX_TRACE_H */