diff options
author | Pawel Osciak <p.osciak@samsung.com> | 2010-09-06 02:53:48 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 05:55:56 -0400 |
commit | d639609061e7ddcd4220c7bcbefd6cb0789454ee (patch) | |
tree | c431dff8cbbf2aa8afc2d855afeac545ba2ef61f | |
parent | 111ac84a80199654db55c06e2565d4ab343c135d (diff) |
[media] v4l: videobuf: remove unused is_userptr variable
Remove unused is_userptr variable from videobuf-dma-contig.
Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index 4d0a723b744b..c9691115f2d2 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c | |||
@@ -28,7 +28,6 @@ struct videobuf_dma_contig_memory { | |||
28 | void *vaddr; | 28 | void *vaddr; |
29 | dma_addr_t dma_handle; | 29 | dma_addr_t dma_handle; |
30 | unsigned long size; | 30 | unsigned long size; |
31 | int is_userptr; | ||
32 | }; | 31 | }; |
33 | 32 | ||
34 | #define MAGIC_DC_MEM 0x0733ac61 | 33 | #define MAGIC_DC_MEM 0x0733ac61 |
@@ -120,7 +119,6 @@ static const struct vm_operations_struct videobuf_vm_ops = { | |||
120 | */ | 119 | */ |
121 | static void videobuf_dma_contig_user_put(struct videobuf_dma_contig_memory *mem) | 120 | static void videobuf_dma_contig_user_put(struct videobuf_dma_contig_memory *mem) |
122 | { | 121 | { |
123 | mem->is_userptr = 0; | ||
124 | mem->dma_handle = 0; | 122 | mem->dma_handle = 0; |
125 | mem->size = 0; | 123 | mem->size = 0; |
126 | } | 124 | } |
@@ -147,7 +145,6 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem, | |||
147 | 145 | ||
148 | offset = vb->baddr & ~PAGE_MASK; | 146 | offset = vb->baddr & ~PAGE_MASK; |
149 | mem->size = PAGE_ALIGN(vb->size + offset); | 147 | mem->size = PAGE_ALIGN(vb->size + offset); |
150 | mem->is_userptr = 0; | ||
151 | ret = -EINVAL; | 148 | ret = -EINVAL; |
152 | 149 | ||
153 | down_read(&mm->mmap_sem); | 150 | down_read(&mm->mmap_sem); |
@@ -181,9 +178,6 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem, | |||
181 | pages_done++; | 178 | pages_done++; |
182 | } | 179 | } |
183 | 180 | ||
184 | if (!ret) | ||
185 | mem->is_userptr = 1; | ||
186 | |||
187 | out_up: | 181 | out_up: |
188 | up_read(¤t->mm->mmap_sem); | 182 | up_read(¤t->mm->mmap_sem); |
189 | 183 | ||