Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f11adc6 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cx88: drop the bogus 'queue' list in dmaqueue 



This list is only used if the width, height and/or format of a buffer has
changed, but that can never happen. Remove it and all associated code.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 637bc207

drivers/media/pci/cx88/cx88-mpeg.c

+0 −31
Original line number Original line Diff line number Diff line
@@ -210,37 +210,7 @@ static int cx8802_restart_queue(struct cx8802_dev *dev, 




	dprintk( 1, "cx8802_restart_queue\n" );

	dprintk( 1, "cx8802_restart_queue\n" );

	if (list_empty(&q->active))

	if (list_empty(&q->active))

	{

		struct cx88_buffer *prev;

		prev = NULL;



		dprintk(1, "cx8802_restart_queue: queue is empty\n" );



		for (;;) {

			if (list_empty(&q->queued))

		return 0;

		return 0;

			buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);

			if (NULL == prev) {

				list_move_tail(&buf->vb.queue, &q->active);

				cx8802_start_dma(dev, q, buf);

				buf->vb.state = VIDEOBUF_ACTIVE;

				buf->count    = q->count++;

				mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);

				dprintk(1,"[%p/%d] restart_queue - first active\n",

					buf,buf->vb.i);



			} else {

				list_move_tail(&buf->vb.queue, &q->active);

				buf->vb.state = VIDEOBUF_ACTIVE;

				buf->count    = q->count++;

				prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);

				dprintk(1,"[%p/%d] restart_queue - move to active\n",

					buf,buf->vb.i);

			}

			prev = buf;

		}

		return 0;

	}





	buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);

	buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);

	dprintk(2,"restart_queue [%p/%d]: restart dma\n",

	dprintk(2,"restart_queue [%p/%d]: restart dma\n",
@@ -486,7 +456,6 @@ static int cx8802_init_common(struct cx8802_dev *dev) 




	/* init dma queue */

	/* init dma queue */

	INIT_LIST_HEAD(&dev->mpegq.active);

	INIT_LIST_HEAD(&dev->mpegq.active);

	INIT_LIST_HEAD(&dev->mpegq.queued);

	dev->mpegq.timeout.function = cx8802_timeout;

	dev->mpegq.timeout.function = cx8802_timeout;

	dev->mpegq.timeout.data     = (unsigned long)dev;

	dev->mpegq.timeout.data     = (unsigned long)dev;

	init_timer(&dev->mpegq.timeout);

	init_timer(&dev->mpegq.timeout);

drivers/media/pci/cx88/cx88-video.c

+3 −36
Original line number Original line Diff line number Diff line
@@ -470,7 +470,7 @@ static int restart_video_queue(struct cx8800_dev *dev, 
			       struct cx88_dmaqueue *q)

			       struct cx88_dmaqueue *q)

{

{

	struct cx88_core *core = dev->core;

	struct cx88_core *core = dev->core;

	struct cx88_buffer *buf, *prev;

	struct cx88_buffer *buf;





	if (!list_empty(&q->active)) {

	if (!list_empty(&q->active)) {

		buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);

		buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
@@ -480,33 +480,8 @@ static int restart_video_queue(struct cx8800_dev *dev, 
		list_for_each_entry(buf, &q->active, vb.queue)

		list_for_each_entry(buf, &q->active, vb.queue)

			buf->count = q->count++;

			buf->count = q->count++;

		mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);

		mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);

		return 0;

	}

	}



	prev = NULL;

	for (;;) {

		if (list_empty(&q->queued))

	return 0;

	return 0;

		buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);

		if (NULL == prev) {

			list_move_tail(&buf->vb.queue, &q->active);

			start_video_dma(dev, q, buf);

			buf->vb.state = VIDEOBUF_ACTIVE;

			buf->count    = q->count++;

			mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);

			dprintk(2,"[%p/%d] restart_queue - first active\n",

				buf,buf->vb.i);



		} else {

			list_move_tail(&buf->vb.queue, &q->active);

			buf->vb.state = VIDEOBUF_ACTIVE;

			buf->count    = q->count++;

			prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);

			dprintk(2,"[%p/%d] restart_queue - move to active\n",

				buf,buf->vb.i);

		}

		prev = buf;

	}

}

}





/* ------------------------------------------------------------------ */

/* ------------------------------------------------------------------ */
@@ -613,13 +588,7 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) 
	buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);

	buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);

	buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);

	buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);





	if (!list_empty(&q->queued)) {

	if (list_empty(&q->active)) {

		list_add_tail(&buf->vb.queue,&q->queued);

		buf->vb.state = VIDEOBUF_QUEUED;

		dprintk(2,"[%p/%d] buffer_queue - append to queued\n",

			buf, buf->vb.i);



	} else if (list_empty(&q->active)) {

		list_add_tail(&buf->vb.queue,&q->active);

		list_add_tail(&buf->vb.queue,&q->active);

		start_video_dma(dev, q, buf);

		start_video_dma(dev, q, buf);

		buf->vb.state = VIDEOBUF_ACTIVE;

		buf->vb.state = VIDEOBUF_ACTIVE;
@@ -1691,7 +1660,6 @@ static int cx8800_initdev(struct pci_dev *pci_dev, 




	/* init video dma queues */

	/* init video dma queues */

	INIT_LIST_HEAD(&dev->vidq.active);

	INIT_LIST_HEAD(&dev->vidq.active);

	INIT_LIST_HEAD(&dev->vidq.queued);

	dev->vidq.timeout.function = cx8800_vid_timeout;

	dev->vidq.timeout.function = cx8800_vid_timeout;

	dev->vidq.timeout.data     = (unsigned long)dev;

	dev->vidq.timeout.data     = (unsigned long)dev;

	init_timer(&dev->vidq.timeout);

	init_timer(&dev->vidq.timeout);
@@ -1700,7 +1668,6 @@ static int cx8800_initdev(struct pci_dev *pci_dev, 




	/* init vbi dma queues */

	/* init vbi dma queues */

	INIT_LIST_HEAD(&dev->vbiq.active);

	INIT_LIST_HEAD(&dev->vbiq.active);

	INIT_LIST_HEAD(&dev->vbiq.queued);

	dev->vbiq.timeout.function = cx8800_vbi_timeout;

	dev->vbiq.timeout.function = cx8800_vbi_timeout;

	dev->vbiq.timeout.data     = (unsigned long)dev;

	dev->vbiq.timeout.data     = (unsigned long)dev;

	init_timer(&dev->vbiq.timeout);

	init_timer(&dev->vbiq.timeout);

drivers/media/pci/cx88/cx88.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -324,7 +324,6 @@ struct cx88_buffer { 




struct cx88_dmaqueue {

struct cx88_dmaqueue {

	struct list_head       active;

	struct list_head       active;

	struct list_head       queued;

	struct timer_list      timeout;

	struct timer_list      timeout;

	struct btcx_riscmem    stopper;

	struct btcx_riscmem    stopper;

	u32                    count;

	u32                    count;