Skip to content

L
linux
Commit d10d1b9a authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files
Options

[media] dvb_usb_v2: use dev_* logging macros 

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a13a6e1f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 135 deletions
drivers/media/dvb/dvb-usb/dvb_usb_core.c
View file @ d10d1b9a
This diff is collapsed.
drivers/media/dvb/dvb-usb/dvb_usb_urb.c
View file @ d10d1b9a
...@@ -29,7 +29,7 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, ...@@ -29,7 +29,7 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
if (!d || !wbuf || !wlen || !d->props->generic_bulk_ctrl_endpoint || if (!d || !wbuf || !wlen || !d->props->generic_bulk_ctrl_endpoint ||
!d->props->generic_bulk_ctrl_endpoint_response) { !d->props->generic_bulk_ctrl_endpoint_response) {
pr_debug("%s: failed=%d\n", __func__, -EINVAL); dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, -EINVAL);
return -EINVAL; return -EINVAL;
} }
...@@ -45,7 +45,8 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, ...@@ -45,7 +45,8 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
d->props->generic_bulk_ctrl_endpoint), wbuf, wlen, d->props->generic_bulk_ctrl_endpoint), wbuf, wlen,
&actual_length, 2000); &actual_length, 2000);
if (ret < 0) if (ret < 0)
pr_err("%s: usb_bulk_msg() failed=%d\n", KBUILD_MODNAME, ret); dev_err(&d->udev->dev, "%s: usb_bulk_msg() failed=%d\n",
KBUILD_MODNAME, ret);
else else
ret = actual_length != wlen ? -EIO : 0; ret = actual_length != wlen ? -EIO : 0;
...@@ -60,8 +61,8 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, ...@@ -60,8 +61,8 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
d->props->generic_bulk_ctrl_endpoint_response), d->props->generic_bulk_ctrl_endpoint_response),
rbuf, rlen, &actual_length, 2000); rbuf, rlen, &actual_length, 2000);
if (ret) if (ret)
pr_err("%s: 2nd usb_bulk_msg() failed=%d\n", dev_err(&d->udev->dev, "%s: 2nd usb_bulk_msg() " \
KBUILD_MODNAME, ret); "failed=%d\n", KBUILD_MODNAME, ret);
#ifdef DVB_USB_XFER_DEBUG #ifdef DVB_USB_XFER_DEBUG
print_hex_dump(KERN_DEBUG, KBUILD_MODNAME ": <<< ", print_hex_dump(KERN_DEBUG, KBUILD_MODNAME ": <<< ",
......
drivers/media/dvb/dvb-usb/usb_urb.c
View file @ d10d1b9a
...@@ -22,8 +22,8 @@ static void usb_urb_complete(struct urb *urb) ...@@ -22,8 +22,8 @@ static void usb_urb_complete(struct urb *urb)
int i; int i;
u8 *b; u8 *b;
pr_debug("%s: %s urb completed status=%d length=%d/%d" \ dev_dbg(&stream->udev->dev, "%s: %s urb completed status=%d " \
" pack_num=%d errors=%d\n", __func__, "length=%d/%d pack_num=%d errors=%d\n", __func__,
ptype == PIPE_ISOCHRONOUS ? "isoc" : "bulk", ptype == PIPE_ISOCHRONOUS ? "isoc" : "bulk",
urb->status, urb->actual_length, urb->status, urb->actual_length,
urb->transfer_buffer_length, urb->transfer_buffer_length,
...@@ -38,8 +38,8 @@ static void usb_urb_complete(struct urb *urb) ...@@ -38,8 +38,8 @@ static void usb_urb_complete(struct urb *urb)
case -ESHUTDOWN: case -ESHUTDOWN:
return; return;
default: /* error */ default: /* error */
pr_debug("%s: urb completition failed=%d\n", __func__, dev_dbg(&stream->udev->dev, "%s: urb completition failed=%d\n",
urb->status); __func__, urb->status);
break; break;
} }
...@@ -48,8 +48,9 @@ static void usb_urb_complete(struct urb *urb) ...@@ -48,8 +48,9 @@ static void usb_urb_complete(struct urb *urb)
case PIPE_ISOCHRONOUS: case PIPE_ISOCHRONOUS:
for (i = 0; i < urb->number_of_packets; i++) { for (i = 0; i < urb->number_of_packets; i++) {
if (urb->iso_frame_desc[i].status != 0) if (urb->iso_frame_desc[i].status != 0)
pr_debug("%s: iso frame descriptor has an " \ dev_dbg(&stream->udev->dev, "%s: iso frame " \
"error=%d\n", __func__, "descriptor has an error=%d\n",
__func__,
urb->iso_frame_desc[i].status); urb->iso_frame_desc[i].status);
else if (urb->iso_frame_desc[i].actual_length > 0) else if (urb->iso_frame_desc[i].actual_length > 0)
stream->complete(stream, stream->complete(stream,
...@@ -65,8 +66,8 @@ static void usb_urb_complete(struct urb *urb) ...@@ -65,8 +66,8 @@ static void usb_urb_complete(struct urb *urb)
stream->complete(stream, b, urb->actual_length); stream->complete(stream, b, urb->actual_length);
break; break;
default: default:
pr_err("%s: unknown endpoint type in completition handler\n", dev_err(&stream->udev->dev, "%s: unknown endpoint type in " \
KBUILD_MODNAME); "completition handler\n", KBUILD_MODNAME);
return; return;
} }
usb_submit_urb(urb, GFP_ATOMIC); usb_submit_urb(urb, GFP_ATOMIC);
...@@ -76,7 +77,7 @@ int usb_urb_killv2(struct usb_data_stream *stream) ...@@ -76,7 +77,7 @@ int usb_urb_killv2(struct usb_data_stream *stream)
{ {
int i; int i;
for (i = 0; i < stream->urbs_submitted; i++) { for (i = 0; i < stream->urbs_submitted; i++) {
pr_debug("%s: kill urb=%d\n", __func__, i); dev_dbg(&stream->udev->dev, "%s: kill urb=%d\n", __func__, i);
/* stop the URB */ /* stop the URB */
usb_kill_urb(stream->urb_list[i]); usb_kill_urb(stream->urb_list[i]);
} }
...@@ -96,11 +97,12 @@ int usb_urb_submitv2(struct usb_data_stream *stream, ...@@ -96,11 +97,12 @@ int usb_urb_submitv2(struct usb_data_stream *stream,
} }
for (i = 0; i < stream->urbs_initialized; i++) { for (i = 0; i < stream->urbs_initialized; i++) {
pr_debug("%s: submit urb=%d\n", __func__, i); dev_dbg(&stream->udev->dev, "%s: submit urb=%d\n", __func__, i);
ret = usb_submit_urb(stream->urb_list[i], GFP_ATOMIC); ret = usb_submit_urb(stream->urb_list[i], GFP_ATOMIC);
if (ret) { if (ret) {
pr_err("%s: could not submit urb no. %d - get them " \ dev_err(&stream->udev->dev, "%s: could not submit " \
"all back\n", KBUILD_MODNAME, i); "urb no. %d - get them all back\n",
KBUILD_MODNAME, i);
usb_urb_killv2(stream); usb_urb_killv2(stream);
return ret; return ret;
} }
...@@ -117,7 +119,8 @@ int usb_urb_free_urbs(struct usb_data_stream *stream) ...@@ -117,7 +119,8 @@ int usb_urb_free_urbs(struct usb_data_stream *stream)
for (i = stream->urbs_initialized - 1; i >= 0; i--) { for (i = stream->urbs_initialized - 1; i >= 0; i--) {
if (stream->urb_list[i]) { if (stream->urb_list[i]) {
pr_debug("%s: free urb=%d\n", __func__, i); dev_dbg(&stream->udev->dev, "%s: free urb=%d\n",
__func__, i);
/* free the URBs */ /* free the URBs */
usb_free_urb(stream->urb_list[i]); usb_free_urb(stream->urb_list[i]);
} }
...@@ -133,10 +136,10 @@ static int usb_urb_alloc_bulk_urbs(struct usb_data_stream *stream) ...@@ -133,10 +136,10 @@ static int usb_urb_alloc_bulk_urbs(struct usb_data_stream *stream)
/* allocate the URBs */ /* allocate the URBs */
for (i = 0; i < stream->props.count; i++) { for (i = 0; i < stream->props.count; i++) {
pr_debug("%s: alloc urb=%d\n", __func__, i); dev_dbg(&stream->udev->dev, "%s: alloc urb=%d\n", __func__, i);
stream->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC); stream->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC);
if (!stream->urb_list[i]) { if (!stream->urb_list[i]) {
pr_debug("%s: failed\n", __func__); dev_dbg(&stream->udev->dev, "%s: failed\n", __func__);
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
usb_free_urb(stream->urb_list[j]); usb_free_urb(stream->urb_list[j]);
return -ENOMEM; return -ENOMEM;
...@@ -164,11 +167,11 @@ static int usb_urb_alloc_isoc_urbs(struct usb_data_stream *stream) ...@@ -164,11 +167,11 @@ static int usb_urb_alloc_isoc_urbs(struct usb_data_stream *stream)
for (i = 0; i < stream->props.count; i++) { for (i = 0; i < stream->props.count; i++) {
struct urb *urb; struct urb *urb;
int frame_offset = 0; int frame_offset = 0;
pr_debug("%s: alloc urb=%d\n", __func__, i); dev_dbg(&stream->udev->dev, "%s: alloc urb=%d\n", __func__, i);
stream->urb_list[i] = usb_alloc_urb( stream->urb_list[i] = usb_alloc_urb(
stream->props.u.isoc.framesperurb, GFP_ATOMIC); stream->props.u.isoc.framesperurb, GFP_ATOMIC);
if (!stream->urb_list[i]) { if (!stream->urb_list[i]) {
pr_debug("%s: failed\n", __func__); dev_dbg(&stream->udev->dev, "%s: failed\n", __func__);
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
usb_free_urb(stream->urb_list[j]); usb_free_urb(stream->urb_list[j]);
return -ENOMEM; return -ENOMEM;
...@@ -206,8 +209,8 @@ int usb_free_stream_buffers(struct usb_data_stream *stream) ...@@ -206,8 +209,8 @@ int usb_free_stream_buffers(struct usb_data_stream *stream)
if (stream->state & USB_STATE_URB_BUF) { if (stream->state & USB_STATE_URB_BUF) {
while (stream->buf_num) { while (stream->buf_num) {
stream->buf_num--; stream->buf_num--;
pr_debug("%s: free buf=%d\n", __func__, dev_dbg(&stream->udev->dev, "%s: free buf=%d\n",
stream->buf_num); __func__, stream->buf_num);
usb_free_coherent(stream->udev, stream->buf_size, usb_free_coherent(stream->udev, stream->buf_size,
stream->buf_list[stream->buf_num], stream->buf_list[stream->buf_num],
stream->dma_addr[stream->buf_num]); stream->dma_addr[stream->buf_num]);
...@@ -225,22 +228,22 @@ int usb_alloc_stream_buffers(struct usb_data_stream *stream, int num, ...@@ -225,22 +228,22 @@ int usb_alloc_stream_buffers(struct usb_data_stream *stream, int num,
stream->buf_num = 0; stream->buf_num = 0;
stream->buf_size = size; stream->buf_size = size;
pr_debug("%s: all in all I will use %lu bytes for streaming\n", dev_dbg(&stream->udev->dev, "%s: all in all I will use %lu bytes for " \
__func__, num * size); "streaming\n", __func__, num * size);
for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) { for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) {
stream->buf_list[stream->buf_num] = usb_alloc_coherent( stream->buf_list[stream->buf_num] = usb_alloc_coherent(
stream->udev, size, GFP_ATOMIC, stream->udev, size, GFP_ATOMIC,
&stream->dma_addr[stream->buf_num]); &stream->dma_addr[stream->buf_num]);
if (!stream->buf_list[stream->buf_num]) { if (!stream->buf_list[stream->buf_num]) {
pr_debug("%s: alloc buf=%d failed\n", __func__, dev_dbg(&stream->udev->dev, "%s: alloc buf=%d failed\n",
stream->buf_num); __func__, stream->buf_num);
usb_free_stream_buffers(stream); usb_free_stream_buffers(stream);
return -ENOMEM; return -ENOMEM;
} }
pr_debug("%s: alloc buf=%d %p (dma %llu)\n", __func__, dev_dbg(&stream->udev->dev, "%s: alloc buf=%d %p (dma %llu)\n",
stream->buf_num, __func__, stream->buf_num,
stream->buf_list[stream->buf_num], stream->buf_list[stream->buf_num],
(long long)stream->dma_addr[stream->buf_num]); (long long)stream->dma_addr[stream->buf_num]);
memset(stream->buf_list[stream->buf_num], 0, size); memset(stream->buf_list[stream->buf_num], 0, size);
...@@ -264,14 +267,15 @@ int usb_urb_reconfig(struct usb_data_stream *stream, ...@@ -264,14 +267,15 @@ int usb_urb_reconfig(struct usb_data_stream *stream,
} else if (props->type == USB_ISOC) { } else if (props->type == USB_ISOC) {
buf_size = props->u.isoc.framesize * props->u.isoc.framesperurb; buf_size = props->u.isoc.framesize * props->u.isoc.framesperurb;
} else { } else {
pr_err("%s: invalid endpoint type=%d\n", KBUILD_MODNAME, dev_err(&stream->udev->dev, "%s: invalid endpoint type=%d\n",
props->type); KBUILD_MODNAME, props->type);
return -EINVAL; return -EINVAL;
} }
if (stream->buf_num < props->count || stream->buf_size < buf_size) { if (stream->buf_num < props->count || stream->buf_size < buf_size) {
pr_err("%s: cannot reconfigure as allocated buffers are too " \ dev_err(&stream->udev->dev, "%s: cannot reconfigure as " \
"small\n", KBUILD_MODNAME); "allocated buffers are too small\n",
KBUILD_MODNAME);
return -EINVAL; return -EINVAL;
} }
...@@ -293,7 +297,7 @@ int usb_urb_reconfig(struct usb_data_stream *stream, ...@@ -293,7 +297,7 @@ int usb_urb_reconfig(struct usb_data_stream *stream,
return 0; return 0;
} }
pr_debug("%s: re-alloc urbs\n", __func__); dev_dbg(&stream->udev->dev, "%s: re-alloc urbs\n", __func__);
usb_urb_free_urbs(stream); usb_urb_free_urbs(stream);
memcpy(&stream->props, props, sizeof(*props)); memcpy(&stream->props, props, sizeof(*props));
...@@ -319,8 +323,8 @@ int usb_urb_initv2(struct usb_data_stream *stream, ...@@ -319,8 +323,8 @@ int usb_urb_initv2(struct usb_data_stream *stream,
stream->props.endpoint)); stream->props.endpoint));
if (!stream->complete) { if (!stream->complete) {
pr_err("%s: there is no data callback - this doesn't make " \ dev_err(&stream->udev->dev, "%s: there is no data callback - " \
"sense\n", KBUILD_MODNAME); "this doesn't make sense\n", KBUILD_MODNAME);
return -EINVAL; return -EINVAL;
} }
...@@ -341,8 +345,8 @@ int usb_urb_initv2(struct usb_data_stream *stream, ...@@ -341,8 +345,8 @@ int usb_urb_initv2(struct usb_data_stream *stream,
return usb_urb_alloc_isoc_urbs(stream); return usb_urb_alloc_isoc_urbs(stream);
default: default:
pr_err("%s: unknown urb-type for data transfer\n", dev_err(&stream->udev->dev, "%s: unknown urb-type for data " \
KBUILD_MODNAME); "transfer\n", KBUILD_MODNAME);
return -EINVAL; return -EINVAL;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7