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

Commit 999b3ceb authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cx88: drop cx88_free_buffer 



Remove this function. This makes all vb2 queues behave the same, which
simplifies comparing the various vb2 queue op implementations.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ static void buffer_finish(struct vb2_buffer *vb) 
	struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);



	cx88_free_buffer(vb->vb2_queue, buf);

	btcx_riscmem_free(dev->pci, &buf->risc);



	dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

}

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

+0 −7
Original line number Diff line number Diff line
@@ -198,12 +198,6 @@ int cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc, 
	return 0;

}



void

cx88_free_buffer(struct vb2_queue *q, struct cx88_buffer *buf)

{

	btcx_riscmem_free(to_pci_dev(q->drv_priv), &buf->risc);

}



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

/* our SRAM memory layout                                             */
@@ -1072,7 +1066,6 @@ EXPORT_SYMBOL(cx88_shutdown); 


EXPORT_SYMBOL(cx88_risc_buffer);

EXPORT_SYMBOL(cx88_risc_databuffer);

EXPORT_SYMBOL(cx88_free_buffer);



EXPORT_SYMBOL(cx88_sram_channels);

EXPORT_SYMBOL(cx88_sram_channel_setup);

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

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static void buffer_finish(struct vb2_buffer *vb) 
	struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);



	cx88_free_buffer(vb->vb2_queue, buf);

	btcx_riscmem_free(dev->pci, &buf->risc);



	dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

}

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

+5 −1
Original line number Diff line number Diff line
@@ -238,8 +238,12 @@ int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev, 
	if (!rc)

		return -EIO;



	cx88_risc_databuffer(dev->pci, &buf->risc, sgt->sgl,

	rc = cx88_risc_databuffer(dev->pci, &buf->risc, sgt->sgl,

			     dev->ts_packet_size, dev->ts_packet_count, 0);

	if (rc) {

		btcx_riscmem_free(dev->pci, &buf->risc);

		return rc;

	}

	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static void buffer_finish(struct vb2_buffer *vb) 
	struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);



	cx88_free_buffer(vb->vb2_queue, buf);

	btcx_riscmem_free(dev->pci, &buf->risc);



	dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

}