Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 409d84f85a8d523ecd108cbe2c0e722682da95ff

Authored by Trent Piepho
Committed by Mauro Carvalho Chehab
1 parent 5a3ebe8755
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (6284): cx23885: Update to new videobuf code 

cx23885 was still uses the old video-buf includes and code, which would only
`work' if one happened to be compiling against a kernel that had the old
headers.  Even then, it wouldn't actually work, it would just compile without
errors.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Showing 2 changed files with 8 additions and 6 deletions Side-by-side Diff

drivers/media/video/cx23885/cx23885-core.c
Diff comments   View file @ 409d84f
... ... @@ -1008,10 +1008,12 @@
1008 1008  
1009 1009 void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
1010 1010 {
  1011 + struct videobuf_dmabuf *dma = videobuf_to_dma(&buf->vb);
  1012 +
1011 1013 BUG_ON(in_interrupt());
1012 1014 videobuf_waiton(&buf->vb, 0, 0);
1013   - videobuf_dma_unmap(q, &buf->vb.dma);
1014   - videobuf_dma_free(&buf->vb.dma);
  1015 + videobuf_dma_unmap(q, dma);
  1016 + videobuf_dma_free(dma);
1015 1017 btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc);
1016 1018 buf->vb.state = STATE_NEEDS_INIT;
1017 1019 }
... ... @@ -1176,8 +1178,8 @@
1176 1178 if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL)))
1177 1179 goto fail;
1178 1180 cx23885_risc_databuffer(dev->pci, &buf->risc,
1179   - buf->vb.dma.sglist,
1180   - buf->vb.width, buf->vb.height);
  1181 + videobuf_to_dma(&buf->vb)->sglist,
  1182 + buf->vb.width, buf->vb.height);
1181 1183 }
1182 1184 buf->vb.state = STATE_PREPARED;
1183 1185 return 0;
drivers/media/video/cx23885/cx23885.h
Diff comments   View file @ 409d84f
... ... @@ -27,8 +27,8 @@
27 27 #include <media/v4l2-common.h>
28 28 #include <media/tuner.h>
29 29 #include <media/tveeprom.h>
30   -#include <media/video-buf.h>
31   -#include <media/video-buf-dvb.h>
  30 +#include <media/videobuf-dma-sg.h>
  31 +#include <media/videobuf-dvb.h>
32 32  
33 33 #include "btcx-risc.h"
34 34 #include "cx23885-reg.h"