summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Salonen <olli.salonen@iki.fi>2014-09-29 04:44:18 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-10-30 11:47:21 -0200
commitb1cb7ad2d2ae4ea7c7dbde6c5f15102016e566d0 (patch)
treef4bea5658d1c7a6ad5d444a64a7f527df30ec564
parent9a25d410bbc84074578ff2fb3c39aa768c7d5555 (diff)
downloadlwn-b1cb7ad2d2ae4ea7c7dbde6c5f15102016e566d0.tar.gz
lwn-b1cb7ad2d2ae4ea7c7dbde6c5f15102016e566d0.zip
[media] sp2: improve debug logging
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>
-rw-r--r--drivers/media/dvb-frontends/sp2.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/media/dvb-frontends/sp2.c b/drivers/media/dvb-frontends/sp2.c
index 1f4f25004711..320cbe951790 100644
--- a/drivers/media/dvb-frontends/sp2.c
+++ b/drivers/media/dvb-frontends/sp2.c
@@ -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,