[24/27] media: usbtv: use usb_fill_int_urb()
flat view
STALE2986d
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: 2018-06-20 11:01:44
Also in:
linux-media
Subsystem:
media input infrastructure (v4l/dvb), the rest · Maintainers:
Mauro Carvalho Chehab, Linus Torvalds
Using usb_fill_int_urb() helps to find code which initializes an URB. A grep for members of the struct (like ->complete) reveal lots of other things, too. Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Hans Verkuil <redacted> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/media/usb/usbtv/usbtv-video.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
index 36a9a4017185..2be4935b7afe 100644
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c@@ -496,26 +496,24 @@ static struct urb *usbtv_setup_iso_transfer(struct usbtv *usbtv) { struct urb *ip; int size = usbtv->iso_size; + void *buf; int i; ip = usb_alloc_urb(USBTV_ISOC_PACKETS, GFP_KERNEL); if (ip == NULL) return NULL; - ip->dev = usbtv->udev; - ip->context = usbtv; - ip->pipe = usb_rcvisocpipe(usbtv->udev, USBTV_VIDEO_ENDP); - ip->interval = 1; - ip->transfer_flags = URB_ISO_ASAP; - ip->transfer_buffer = kcalloc(USBTV_ISOC_PACKETS, size, - GFP_KERNEL); - if (!ip->transfer_buffer) { + buf = kcalloc(USBTV_ISOC_PACKETS, size, GFP_KERNEL); + if (!buf) { usb_free_urb(ip); return NULL; } - ip->complete = usbtv_iso_cb; + usb_fill_int_urb(ip, usbtv->udev, + usb_rcvisocpipe(usbtv->udev, USBTV_VIDEO_ENDP), + buf, size * USBTV_ISOC_PACKETS, usbtv_iso_cb, + usbtv, 1); + ip->transfer_flags = URB_ISO_ASAP; ip->number_of_packets = USBTV_ISOC_PACKETS; - ip->transfer_buffer_length = size * USBTV_ISOC_PACKETS; for (i = 0; i < USBTV_ISOC_PACKETS; i++) { ip->iso_frame_desc[i].offset = size * i; ip->iso_frame_desc[i].length = size;