media: uvcvideo: Convert decode functions to use new context structure

The URB completion handlers currently reference the stream context.

Now that each URB has its own context structure, convert the decode (and
one encode) functions to utilise this context for URB management.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/usb/uvc/uvc_isight.c b/drivers/media/usb/uvc/uvc_isight.c
index 81e6f2187bfb032e9537b8267ceac6988852dcaa..39a4e4482b2378e72f02b9fb3f9945bede6d694c 100644 (file)
--- a/drivers/media/usb/uvc/uvc_isight.c
+++ b/drivers/media/usb/uvc/uvc_isight.c
@@ -99,9 +99,11 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf,
        return 0;
 }
 
-void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream,
-                       struct uvc_buffer *buf, struct uvc_buffer *meta_buf)
+void uvc_video_decode_isight(struct uvc_urb *uvc_urb, struct uvc_buffer *buf,
+                       struct uvc_buffer *meta_buf)
 {
+       struct urb *urb = uvc_urb->urb;
+       struct uvc_streaming *stream = uvc_urb->stream;
        int ret, i;
 
        for (i = 0; i < urb->number_of_packets; ++i) {

diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 113881bed2a4d87e7e158d808df8b88fdadcbb87..6d4384695964a578f0c6e6018e686693e187e5d8 100644 (file)
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -1291,9 +1291,11 @@ static void uvc_video_next_buffers(struct uvc_streaming *stream,
        *video_buf = uvc_queue_next_buffer(&stream->queue, *video_buf);
 }
 
-static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream,
+static void uvc_video_decode_isoc(struct uvc_urb *uvc_urb,
                        struct uvc_buffer *buf, struct uvc_buffer *meta_buf)
 {
+       struct urb *urb = uvc_urb->urb;
+       struct uvc_streaming *stream = uvc_urb->stream;
        u8 *mem;
        int ret, i;
 
@@ -1334,9 +1336,11 @@ static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream,
        }
 }
 
-static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream,
+static void uvc_video_decode_bulk(struct uvc_urb *uvc_urb,
                        struct uvc_buffer *buf, struct uvc_buffer *meta_buf)
 {
+       struct urb *urb = uvc_urb->urb;
+       struct uvc_streaming *stream = uvc_urb->stream;
        u8 *mem;
        int len, ret;
 
@@ -1402,9 +1406,12 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream,
        }
 }
 
-static void uvc_video_encode_bulk(struct urb *urb, struct uvc_streaming *stream,
+static void uvc_video_encode_bulk(struct uvc_urb *uvc_urb,
        struct uvc_buffer *buf, struct uvc_buffer *meta_buf)
 {
+       struct urb *urb = uvc_urb->urb;
+       struct uvc_streaming *stream = uvc_urb->stream;
+
        u8 *mem = urb->transfer_buffer;
        int len = stream->urb_size, ret;
 
@@ -1447,7 +1454,8 @@ static void uvc_video_encode_bulk(struct urb *urb, struct uvc_streaming *stream,
 
 static void uvc_video_complete(struct urb *urb)
 {
-       struct uvc_streaming *stream = urb->context;
+       struct uvc_urb *uvc_urb = urb->context;
+       struct uvc_streaming *stream = uvc_urb->stream;
        struct uvc_video_queue *queue = &stream->queue;
        struct uvc_video_queue *qmeta = &stream->meta.queue;
        struct vb2_queue *vb2_qmeta = stream->meta.vdev.queue;
@@ -1490,7 +1498,7 @@ static void uvc_video_complete(struct urb *urb)
                spin_unlock_irqrestore(&qmeta->irqlock, flags);
        }
 
-       stream->decode(urb, stream, buf, buf_meta);
+       stream->decode(uvc_urb, buf, buf_meta);
 
        if ((ret = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
                uvc_printk(KERN_ERR, "Failed to resubmit video URB (%d).\n",
@@ -1568,6 +1576,8 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
                                uvc_free_urb_buffers(stream);
                                break;
                        }
+
+                       uvc_urb->stream = stream;
                }
 
                if (i == UVC_URBS) {
@@ -1666,7 +1676,7 @@ static int uvc_init_video_isoc(struct uvc_streaming *stream,
                }
 
                urb->dev = stream->dev->udev;
-               urb->context = stream;
+               urb->context = uvc_urb;
                urb->pipe = usb_rcvisocpipe(stream->dev->udev,
                                ep->desc.bEndpointAddress);
 #ifndef CONFIG_DMA_NONCOHERENT
@@ -1733,8 +1743,8 @@ static int uvc_init_video_bulk(struct uvc_streaming *stream,
                        return -ENOMEM;
                }
 
-               usb_fill_bulk_urb(urb, stream->dev->udev, pipe, uvc_urb->buffer,
-                                 size, uvc_video_complete, stream);
+               usb_fill_bulk_urb(urb, stream->dev->udev, pipe, uvc_urb->buffer,
+                                 size, uvc_video_complete, uvc_urb);
 #ifndef CONFIG_DMA_NONCOHERENT
                urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
                urb->transfer_dma = uvc_urb->dma;

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 81f29b9e4118b004ad2f546673ef1d2c4a362497..35ba487692443db5f13ea6228a3ace79f671923a 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -494,11 +494,13 @@ struct uvc_stats_stream {
  * struct uvc_urb - URB context management structure
  *
  * @urb: the URB described by this context structure
+ * @stream: UVC streaming context
  * @buffer: memory storage for the URB
  * @dma: DMA coherent addressing for the urb_buffer
  */
 struct uvc_urb {
        struct urb *urb;
+       struct uvc_streaming *stream;
 
        char *buffer;
        dma_addr_t dma;
@@ -534,8 +536,8 @@ struct uvc_streaming {
        /* Buffers queue. */
        unsigned int frozen : 1;
        struct uvc_video_queue queue;
-       void (*decode) (struct urb *urb, struct uvc_streaming *video,
-                       struct uvc_buffer *buf, struct uvc_buffer *meta_buf);
+       void (*decode)(struct uvc_urb *uvc_urb, struct uvc_buffer *buf,
+                      struct uvc_buffer *meta_buf);
 
        struct {
                struct video_device vdev;
@@ -822,7 +824,7 @@ struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alts,
                                            u8 epaddr);
 
 /* Quirks support */
-void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream,
+void uvc_video_decode_isight(struct uvc_urb *uvc_urb,
                             struct uvc_buffer *buf,
                             struct uvc_buffer *meta_buf);