[media] dvb-usb: use %*ph to dump small buffers

[crope@iki.fi: fix trivial merge conflict]
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb-v2/af9015.c b/drivers/media/dvb/dvb-usb-v2/af9015.c
index 10363f6b5234aebb86f60b5c20af35c2ab1063be..e77429b37a7dfcffa3cb37308ed6dd5b183a3cf3 100644 (file)
--- a/drivers/media/dvb/dvb-usb-v2/af9015.c
+++ b/drivers/media/dvb/dvb-usb-v2/af9015.c
@@ -1199,8 +1199,7 @@ static int af9015_rc_query(struct dvb_usb_device *d)
 
        /* Only process key if canary killed */
        if (buf[16] != 0xff && buf[0] != 0x01) {
-               deb_rc("%s: key pressed %02x %02x %02x %02x\n", __func__,
-                       buf[12], buf[13], buf[14], buf[15]);
+               deb_rc("%s: key pressed %*ph\n", __func__, 4, buf + 12);
 
                /* Reset the canary */
                ret = af9015_write_reg(d, 0x98e9, 0xff);

diff --git a/drivers/media/dvb/dvb-usb-v2/af9035.c b/drivers/media/dvb/dvb-usb-v2/af9035.c
index 79197f46aa95031198a0ecfbc1f90d150b33fff2..bb90b877d07bb84927caabe86dd54558171d7840 100644 (file)
--- a/drivers/media/dvb/dvb-usb-v2/af9035.c
+++ b/drivers/media/dvb/dvb-usb-v2/af9035.c
@@ -290,8 +290,7 @@ static int af9035_identify_state(struct dvb_usb_device *d, const char **name)
        if (ret < 0)
                goto err;
 
-       pr_debug("%s: reply=%02x %02x %02x %02x\n", __func__,
-               rbuf[0], rbuf[1], rbuf[2], rbuf[3]);
+       pr_debug("%s: reply=%*ph\n", __func__, 4, rbuf);
        if (rbuf[0] || rbuf[1] || rbuf[2] || rbuf[3])
                ret = WARM;
        else

diff --git a/drivers/media/dvb/dvb-usb/pctv452e.c b/drivers/media/dvb/dvb-usb/pctv452e.c
index f526eb05cc7a1f4db4327dfe286ecc2174d62ca4..02e878577c3dcb33f2cb18f0cfe9b6361a73b452 100644 (file)
--- a/drivers/media/dvb/dvb-usb/pctv452e.c
+++ b/drivers/media/dvb/dvb-usb/pctv452e.c
@@ -136,8 +136,8 @@ static int tt3650_ci_msg(struct dvb_usb_device *d, u8 cmd, u8 *data,
        return 0;
 
 failed:
-       err("CI error %d; %02X %02X %02X -> %02X %02X %02X.",
-            ret, SYNC_BYTE_OUT, id, cmd, buf[0], buf[1], buf[2]);
+       err("CI error %d; %02X %02X %02X -> %*ph.",
+            ret, SYNC_BYTE_OUT, id, cmd, 3, buf);
 
        return ret;
 }
@@ -556,8 +556,7 @@ static int pctv452e_rc_query(struct dvb_usb_device *d)
                return ret;
 
        if (debug > 3) {
-               info("%s: read: %2d: %02x %02x %02x: ", __func__,
-                               ret, rx[0], rx[1], rx[2]);
+               info("%s: read: %2d: %*ph: ", __func__, ret, 3, rx);
                for (i = 0; (i < rx[3]) && ((i+3) < PCTV_ANSWER_LEN); i++)
                        info(" %02x", rx[i+3]);