From: Hans Verkuil Date: Sun, 28 Mar 2010 10:59:11 +0000 (-0300) Subject: V4L/DVB: v4l videobuf: remove unused is_mmapped field X-Git-Tag: MMI-PSA29.97-13-9~23880^2~143 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=63e424856b4ab0652c58f75a2d2ecb9c1f95db27;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git V4L/DVB: v4l videobuf: remove unused is_mmapped field Thanks to Pawel Osciak for noticing this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index 52bb74b18a68..d76a7d500029 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c @@ -321,8 +321,6 @@ static int __videobuf_mmap_free(struct videobuf_queue *q) if (q->bufs[i] && q->bufs[i]->map) return -EBUSY; - q->is_mmapped = 0; - for (i = 0; i < VIDEO_MAX_FRAME; i++) { if (NULL == q->bufs[i]) continue; @@ -1089,7 +1087,6 @@ int videobuf_mmap_mapper(struct videobuf_queue *q, struct vm_area_struct *vma) mutex_lock(&q->vb_lock); retval = CALL(q, mmap_mapper, q, vma); - q->is_mmapped = 1; mutex_unlock(&q->vb_lock); return retval; diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 345ec5a45c55..22d5a02884ad 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h @@ -166,7 +166,6 @@ struct videobuf_queue { unsigned int streaming:1; unsigned int reading:1; - unsigned int is_mmapped:1; /* capture via mmap() + ioctl(QBUF/DQBUF) */ struct list_head stream;