summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/dvb_usb_urb.c
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-06-06 22:46:38 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-04 07:56:27 -0300
commit23d8e63a903bf8b6d9bf99bdd0e45aa901a90fff (patch)
tree288890b1ed10cb57f32a7cd117950f9f7ff11a92 /drivers/media/dvb/dvb-usb/dvb_usb_urb.c
parentcce99cf93312ed0de22128037de11e00fa327cb5 (diff)
[media] dvb_usb_v2: use Kernel logging (pr_debug/pr_err/pr_info)
Use Kernel logging insteads of own macros. Get rid of old debugs and use dynamic debug. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb_usb_urb.c')
-rw-r--r--drivers/media/dvb/dvb-usb/dvb_usb_urb.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_urb.c b/drivers/media/dvb/dvb-usb/dvb_usb_urb.c
index 43563b341b8..e28a4dc3cb0 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_urb.c
@@ -17,7 +17,8 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
return -EINVAL;
if (d->props.generic_bulk_ctrl_endpoint == 0) {
- err("endpoint for generic control not specified.");
+ pr_err("%s: endpoint for generic control not specified",
+ KBUILD_MODNAME);
return -EINVAL;
}
@@ -25,15 +26,16 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
if (ret)
return ret;
- deb_xfer(">>> ");
- debug_dump(wbuf, wlen, deb_xfer);
+ print_hex_dump(KERN_DEBUG, KBUILD_MODNAME ": >>> ", DUMP_PREFIX_NONE,
+ 32, 1, wbuf, wlen, 0);
ret = usb_bulk_msg(d->udev, usb_sndbulkpipe(d->udev,
d->props.generic_bulk_ctrl_endpoint), wbuf, wlen,
&actlen, 2000);
if (ret)
- err("bulk message failed: %d (%d/%d)", ret, wlen, actlen);
+ pr_err("%s: bulk message failed: %d (%d/%d)", KBUILD_MODNAME,
+ ret, wlen, actlen);
else
ret = actlen != wlen ? -1 : 0;
@@ -49,11 +51,11 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
rbuf, rlen, &actlen, 2000);
if (ret)
- err("recv bulk message failed: %d", ret);
- else {
- deb_xfer("<<< ");
- debug_dump(rbuf, actlen, deb_xfer);
- }
+ pr_err("%s: recv bulk message failed: %d",
+ KBUILD_MODNAME, ret);
+ else
+ print_hex_dump(KERN_DEBUG, KBUILD_MODNAME ": <<< ",
+ DUMP_PREFIX_NONE, 32, 1, wbuf, wlen, 0);
}
mutex_unlock(&d->usb_mutex);