[media] sp2: improve debug logging
authorOlli Salonen <olli.salonen@iki.fi>
Mon, 29 Sep 2014 07:44:18 +0000 (04:44 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 30 Oct 2014 13:47:21 +0000 (11:47 -0200)
Improve debugging output.

Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/dvb-frontends/sp2.c

index 1f4f250..320cbe9 100644 (file)
@@ -92,6 +92,9 @@ static int sp2_write_i2c(struct sp2 *s, u8 reg, u8 *buf, int len)
                        return -EIO;
        }
 
+       dev_dbg(&s->client->dev, "addr=0x%04x, reg = 0x%02x, data = %*ph\n",
+                               client->addr, reg, len, buf);
+
        return 0;
 }
 
@@ -103,9 +106,6 @@ static int sp2_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, u8 acs,
        int mem, ret;
        int (*ci_op_cam)(void*, u8, int, u8, int*) = s->ci_control;
 
-       dev_dbg(&s->client->dev, "slot=%d, acs=0x%02x, addr=0x%04x, data = 0x%02x",
-                       slot, acs, addr, data);
-
        if (slot != 0)
                return -EINVAL;
 
@@ -140,13 +140,16 @@ static int sp2_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, u8 acs,
        if (ret)
                return ret;
 
-       if (read) {
-               dev_dbg(&s->client->dev, "cam read, addr=0x%04x, data = 0x%04x",
-                               addr, mem);
+       dev_dbg(&s->client->dev, "%s: slot=%d, addr=0x%04x, %s, data=%x",
+                       (read) ? "read" : "write", slot, addr,
+                       (acs == SP2_CI_ATTR_ACS) ? "attr" : "io",
+                       (read) ? mem : data);
+
+       if (read)
                return mem;
-       } else {
+       else
                return 0;
-       }
+
 }
 
 int sp2_ci_read_attribute_mem(struct dvb_ca_en50221 *en50221,