[media] em28xx: refactor get_next_buf() and use it for vbi data, too

get_next_buf() and vbi_get_next_buf() do exactly the same just with a
different dma queue and buffer. Saving the new buffer pointer back to the
device struct in em28xx_urb_data_copy() instead of doing this from inside
these functions makes it possible to get rid of one of them.
Also refactor the function parameters and return type:
- pass a pointer to struct em28xx as parameter (instead of obtaining the
  pointer from the dma queue pointer with the container_of macro) like we do
  it in all other functions
- instead of using a pointer-pointer, return the pointer to the new buffer
  as return value of the function

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index a1436a453bc895d9d2b60b469ce8a365a49d86ec..db27499ecaa233de37a7e1f2db8c4b89b8addff0 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -359,57 +359,26 @@ static inline void print_err_status(struct em28xx *dev,
 }
 
 /*
- * video-buf generic routine to get the next available buffer
+ * get the next available buffer from dma queue
  */
-static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
-                                         struct em28xx_buffer **buf)
+static inline struct em28xx_buffer *get_next_buf(struct em28xx *dev,
+                                                struct em28xx_dmaqueue *dma_q)
 {
-       struct em28xx *dev = container_of(dma_q, struct em28xx, vidq);
+       struct em28xx_buffer *buf;
        char *outp;
 
        if (list_empty(&dma_q->active)) {
                em28xx_isocdbg("No active queue to serve\n");
-               dev->usb_ctl.vid_buf = NULL;
-               *buf = NULL;
-               return;
-       }
-
-       /* Get the next buffer */
-       *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
-       /* Cleans up buffer - Useful for testing for frame/URB loss */
-       outp = videobuf_to_vmalloc(&(*buf)->vb);
-       memset(outp, 0, (*buf)->vb.size);
-
-       dev->usb_ctl.vid_buf = *buf;
-
-       return;
-}
-
-/*
- * video-buf generic routine to get the next available VBI buffer
- */
-static inline void vbi_get_next_buf(struct em28xx_dmaqueue *dma_q,
-                                   struct em28xx_buffer **buf)
-{
-       struct em28xx *dev = container_of(dma_q, struct em28xx, vbiq);
-       char *outp;
-
-       if (list_empty(&dma_q->active)) {
-               em28xx_isocdbg("No active queue to serve\n");
-               dev->usb_ctl.vbi_buf = NULL;
-               *buf = NULL;
-               return;
+               return NULL;
        }
 
        /* Get the next buffer */
-       *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
+       buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
        /* Cleans up buffer - Useful for testing for frame/URB loss */
-       outp = videobuf_to_vmalloc(&(*buf)->vb);
-       memset(outp, 0x00, (*buf)->vb.size);
-
-       dev->usb_ctl.vbi_buf = *buf;
+       outp = videobuf_to_vmalloc(&buf->vb);
+       memset(outp, 0, buf->vb.size);
 
-       return;
+       return buf;
 }
 
 /* Processes and copies the URB data content (video and VBI data) */
@@ -519,7 +488,8 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb)
                                                vbi_buffer_filled(dev,
                                                                  vbi_dma_q,
                                                                  vbi_buf);
-                                       vbi_get_next_buf(vbi_dma_q, &vbi_buf);
+                                       vbi_buf = get_next_buf(dev, vbi_dma_q);
+                                       dev->usb_ctl.vbi_buf = vbi_buf;
                                        if (vbi_buf == NULL)
                                                vbioutp = NULL;
                                        else
@@ -530,7 +500,8 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb)
                                if (dev->vbi_read == 0) {
                                        vbi_dma_q->pos = 0;
                                        if (vbi_buf != NULL)
-                                               vbi_buf->top_field = dev->top_field;
+                                               vbi_buf->top_field
+                                                 = dev->top_field;
                                }
 
                                dev->vbi_read += len;
@@ -554,7 +525,8 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb)
                        if (dev->progressive || dev->top_field) {
                                if (buf != NULL)
                                        buffer_filled(dev, dma_q, buf);
-                               get_next_buf(dma_q, &buf);
+                               buf = get_next_buf(dev, dma_q);
+                               dev->usb_ctl.vid_buf = buf;
                                if (buf == NULL)
                                        outp = NULL;
                                else