From: Andy Walls <awalls@radix.net>
Date: Fri, 22 Aug 2008 23:55:54 +0000 (-0300)
Subject: V4L/DVB (8771): cx18: Remove redundant struct cx18_queue length member.
X-Git-Tag: firefly_0821_release~17709^2~253
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59ba2b002265f2e862aa7f0df3f13c09ea99c4da;p=firefly-linux-kernel-4.4.55.git

V4L/DVB (8771): cx18: Remove redundant struct cx18_queue length member.

cx18: Remove redundant struct cx18_queue length member. It can be trivially
computed from queue->buffers * stream->buf_size, if ever really needed.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index db7483bea44a..28c490b1b64e 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -217,7 +217,6 @@ struct cx18_buffer {
 struct cx18_queue {
 	struct list_head list;
 	u32 buffers;
-	u32 length;
 	u32 bytesused;
 };
 
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 1e537fe04a23..2fdbfb994dd5 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -509,7 +509,7 @@ unsigned int cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
 	CX18_DEBUG_HI_FILE("Encoder poll\n");
 	poll_wait(filp, &s->waitq, wait);
 
-	if (s->q_full.length || s->q_io.length)
+	if (s->q_full.buffers || s->q_io.buffers)
 		return POLLIN | POLLRDNORM;
 	if (eof)
 		return POLLHUP;
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index dbe792ac3001..4f3bd43ba802 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -38,7 +38,6 @@ void cx18_queue_init(struct cx18_queue *q)
 {
 	INIT_LIST_HEAD(&q->list);
 	q->buffers = 0;
-	q->length = 0;
 	q->bytesused = 0;
 }
 
@@ -56,7 +55,6 @@ void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,
 	spin_lock_irqsave(&s->qlock, flags);
 	list_add_tail(&buf->list, &q->list);
 	q->buffers++;
-	q->length += s->buf_size;
 	q->bytesused += buf->bytesused - buf->readpos;
 	spin_unlock_irqrestore(&s->qlock, flags);
 }
@@ -71,7 +69,6 @@ struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q)
 		buf = list_entry(q->list.next, struct cx18_buffer, list);
 		list_del_init(q->list.next);
 		q->buffers--;
-		q->length -= s->buf_size;
 		q->bytesused -= buf->bytesused - buf->readpos;
 	}
 	spin_unlock_irqrestore(&s->qlock, flags);
@@ -96,9 +93,7 @@ struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,
 		   they are not moved to the full queue */
 		if (s->type != CX18_ENC_STREAM_TYPE_TS) {
 			s->q_free.buffers--;
-			s->q_free.length -= s->buf_size;
 			s->q_full.buffers++;
-			s->q_full.length += s->buf_size;
 			s->q_full.bytesused += buf->bytesused;
 			list_move_tail(&buf->list, &s->q_full.list);
 		}
@@ -125,7 +120,6 @@ static void cx18_queue_flush(struct cx18_stream *s, struct cx18_queue *q)
 		list_move_tail(q->list.next, &s->q_free.list);
 		buf->bytesused = buf->readpos = buf->b_flags = 0;
 		s->q_free.buffers++;
-		s->q_free.length += s->buf_size;
 	}
 	cx18_queue_init(q);
 	spin_unlock_irqrestore(&s->qlock, flags);