1 files changed, 0 insertions, 49 deletions

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 43e78ee24a10..5c55bd392ea3 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -644,53 +644,6 @@ done:
         return retval;
 }
 
-static int __videobuf_copy_to_user(struct videobuf_queue *q,
-                                char __user *data, size_t count,
-                                int nonblocking)
-{
-        struct videobuf_dma_sg_memory *mem = q->read_buf->priv;
-        BUG_ON(!mem);
-        MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);
-
-        /* copy to userspace */
-        if (count > q->read_buf->size - q->read_off)
-                count = q->read_buf->size - q->read_off;
-
-        if (copy_to_user(data, mem->dma.vmalloc+q->read_off, count))
-                return -EFAULT;
-
-        return count;
-}
-
-static int __videobuf_copy_stream(struct videobuf_queue *q,
-                                char __user *data, size_t count, size_t pos,
-                                int vbihack, int nonblocking)
-{
-        unsigned int *fc;
-        struct videobuf_dma_sg_memory *mem = q->read_buf->priv;
-        BUG_ON(!mem);
-        MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);
-
-        if (vbihack) {
-                /* dirty, undocumented hack -- pass the frame counter
-                 * within the last four bytes of each vbi data block.
-                 * We need that one to maintain backward compatibility
-                 * to all vbi decoding software out there ... */
-                fc  = (unsigned int *)mem->dma.vmalloc;
-                fc += (q->read_buf->size >> 2) - 1;
-                *fc = q->read_buf->field_count >> 1;
-                dprintk(1, "vbihack: %d\n", *fc);
-        }
-
-        /* copy stuff using the common method */
-        count = __videobuf_copy_to_user(q, data, count, nonblocking);
-
-        if ((count == -EFAULT) && (0 == pos))
-                return -EFAULT;
-
-        return count;
-}
-
 static struct videobuf_qtype_ops sg_ops = {
         .magic        = MAGIC_QTYPE_OPS,
 
@@ -698,8 +651,6 @@ static struct videobuf_qtype_ops sg_ops = {
         .iolock       = __videobuf_iolock,
         .sync         = __videobuf_sync,
         .mmap_mapper  = __videobuf_mmap_mapper,
-        .video_copy_to_user = __videobuf_copy_to_user,
-        .copy_stream  = __videobuf_copy_stream,
         .vaddr        = __videobuf_to_vaddr,
 };