diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2012-08-07 11:43:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-13 15:39:33 -0400 |
commit | 090fdc17bc1a8c481c342be9bb1e32ccdeb32d80 (patch) | |
tree | a1911dfaed7197cb2efb131ae829d39c8a07c2b5 | |
parent | 70aa34569a7d99d5ea505421af07f335dcaabb73 (diff) |
[media] dvb: use %*ph to hexdump small buffers
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/b2c2/flexcop-usb.c | 5 | ||||
-rw-r--r-- | drivers/media/dvb/bt8xx/dst_ca.c | 3 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dmxdev.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/ngene/ngene-core.c | 14 |
4 files changed, 8 insertions, 18 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c index 26c666dd3514..8b6275f85908 100644 --- a/drivers/media/dvb/b2c2/flexcop-usb.c +++ b/drivers/media/dvb/b2c2/flexcop-usb.c | |||
@@ -324,10 +324,7 @@ static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, | |||
324 | flexcop_pass_dmx_packets( | 324 | flexcop_pass_dmx_packets( |
325 | fc_usb->fc_dev, b+2, 1); | 325 | fc_usb->fc_dev, b+2, 1); |
326 | else | 326 | else |
327 | deb_ts( | 327 | deb_ts("not ts packet %*ph\n", 4, b+2); |
328 | "not ts packet %02x %02x %02x %02x \n", | ||
329 | *(b+2), *(b+3), | ||
330 | *(b+4), *(b+5)); | ||
331 | b += 190; | 328 | b += 190; |
332 | l -= 190; | 329 | l -= 190; |
333 | break; | 330 | break; |
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c index 66f52f116b60..ee3884fbc9ce 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/dvb/bt8xx/dst_ca.c | |||
@@ -321,7 +321,8 @@ static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message, | |||
321 | return -EFAULT; | 321 | return -EFAULT; |
322 | 322 | ||
323 | if (p_ca_message->msg) { | 323 | if (p_ca_message->msg) { |
324 | dprintk(verbose, DST_CA_NOTICE, 1, " Message = [%02x %02x %02x]", p_ca_message->msg[0], p_ca_message->msg[1], p_ca_message->msg[2]); | 324 | dprintk(verbose, DST_CA_NOTICE, 1, " Message = [%*ph]", |
325 | 3, p_ca_message->msg); | ||
325 | 326 | ||
326 | for (i = 0; i < 3; i++) { | 327 | for (i = 0; i < 3; i++) { |
327 | command = command | p_ca_message->msg[i]; | 328 | command = command | p_ca_message->msg[i]; |
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c index 73970cd97af1..889c9c16c6df 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.c +++ b/drivers/media/dvb/dvb-core/dmxdev.c | |||
@@ -370,9 +370,7 @@ static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len, | |||
370 | return 0; | 370 | return 0; |
371 | } | 371 | } |
372 | del_timer(&dmxdevfilter->timer); | 372 | del_timer(&dmxdevfilter->timer); |
373 | dprintk("dmxdev: section callback %02x %02x %02x %02x %02x %02x\n", | 373 | dprintk("dmxdev: section callback %*ph\n", 6, buffer1); |
374 | buffer1[0], buffer1[1], | ||
375 | buffer1[2], buffer1[3], buffer1[4], buffer1[5]); | ||
376 | ret = dvb_dmxdev_buffer_write(&dmxdevfilter->buffer, buffer1, | 374 | ret = dvb_dmxdev_buffer_write(&dmxdevfilter->buffer, buffer1, |
377 | buffer1_len); | 375 | buffer1_len); |
378 | if (ret == buffer1_len) { | 376 | if (ret == buffer1_len) { |
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c index 39857384af10..c8e0d5b99d4c 100644 --- a/drivers/media/dvb/ngene/ngene-core.c +++ b/drivers/media/dvb/ngene/ngene-core.c | |||
@@ -258,22 +258,16 @@ static void dump_command_io(struct ngene *dev) | |||
258 | u8 buf[8], *b; | 258 | u8 buf[8], *b; |
259 | 259 | ||
260 | ngcpyfrom(buf, HOST_TO_NGENE, 8); | 260 | ngcpyfrom(buf, HOST_TO_NGENE, 8); |
261 | printk(KERN_ERR "host_to_ngene (%04x): %02x %02x %02x %02x %02x %02x %02x %02x\n", | 261 | printk(KERN_ERR "host_to_ngene (%04x): %*ph\n", HOST_TO_NGENE, 8, buf); |
262 | HOST_TO_NGENE, buf[0], buf[1], buf[2], buf[3], | ||
263 | buf[4], buf[5], buf[6], buf[7]); | ||
264 | 262 | ||
265 | ngcpyfrom(buf, NGENE_TO_HOST, 8); | 263 | ngcpyfrom(buf, NGENE_TO_HOST, 8); |
266 | printk(KERN_ERR "ngene_to_host (%04x): %02x %02x %02x %02x %02x %02x %02x %02x\n", | 264 | printk(KERN_ERR "ngene_to_host (%04x): %*ph\n", NGENE_TO_HOST, 8, buf); |
267 | NGENE_TO_HOST, buf[0], buf[1], buf[2], buf[3], | ||
268 | buf[4], buf[5], buf[6], buf[7]); | ||
269 | 265 | ||
270 | b = dev->hosttongene; | 266 | b = dev->hosttongene; |
271 | printk(KERN_ERR "dev->hosttongene (%p): %02x %02x %02x %02x %02x %02x %02x %02x\n", | 267 | printk(KERN_ERR "dev->hosttongene (%p): %*ph\n", b, 8, b); |
272 | b, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]); | ||
273 | 268 | ||
274 | b = dev->ngenetohost; | 269 | b = dev->ngenetohost; |
275 | printk(KERN_ERR "dev->ngenetohost (%p): %02x %02x %02x %02x %02x %02x %02x %02x\n", | 270 | printk(KERN_ERR "dev->ngenetohost (%p): %*ph\n", b, 8, b); |
276 | b, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]); | ||
277 | } | 271 | } |
278 | 272 | ||
279 | static int ngene_command_mutex(struct ngene *dev, struct ngene_command *com) | 273 | static int ngene_command_mutex(struct ngene *dev, struct ngene_command *com) |