Commit 59ba2b00 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

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: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a928880a

drivers/media/video/cx18/cx18-driver.h

+0 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ struct cx18_buffer { 
struct cx18_queue {

	struct list_head list;

	u32 buffers;

	u32 length;

	u32 bytesused;

};

drivers/media/video/cx18/cx18-fileops.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/cx18/cx18-queue.c

+0 −6
Original line number Diff line number Diff line
@@ -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);