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

Commit 97f8105d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB: videobuf-dma-sg: remove external function videobuf_dma_sync() 



While analyzing one of the videobuf patches, I noticed that
videobuf_dma_sync is only used internally inside videobuf-dma-sg.
So, let's remove this function, merging the code at __videobuf_dma_sync()

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 21636363

drivers/media/video/videobuf-dma-sg.c

+7 −13
Original line number Diff line number Diff line
@@ -279,17 +279,6 @@ int videobuf_dma_map(struct videobuf_queue *q, struct videobuf_dmabuf *dma) 
}

EXPORT_SYMBOL_GPL(videobuf_dma_map);



int videobuf_dma_sync(struct videobuf_queue *q, struct videobuf_dmabuf *dma)

{

	MAGIC_CHECK(dma->magic, MAGIC_DMABUF);

	BUG_ON(!dma->sglen);



	dma_sync_sg_for_cpu(q->dev, dma->sglist, dma->nr_pages, dma->direction);



	return 0;

}

EXPORT_SYMBOL_GPL(videobuf_dma_sync);



int videobuf_dma_unmap(struct videobuf_queue *q, struct videobuf_dmabuf *dma)

{

	MAGIC_CHECK(dma->magic, MAGIC_DMABUF);
@@ -542,10 +531,15 @@ static int __videobuf_sync(struct videobuf_queue *q, 
			   struct videobuf_buffer *buf)

{

	struct videobuf_dma_sg_memory *mem = buf->priv;

	BUG_ON(!mem);

	BUG_ON(!mem || !mem->dma.sglen);



	MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);

	MAGIC_CHECK(mem->dma.magic, MAGIC_DMABUF);



	return videobuf_dma_sync(q, &mem->dma);

	dma_sync_sg_for_cpu(q->dev, mem->dma.sglist,

			    mem->dma.nr_pages, mem->dma.direction);



	return 0;

}



static int __videobuf_mmap_mapper(struct videobuf_queue *q,

include/media/videobuf-dma-sg.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction, 
int videobuf_dma_free(struct videobuf_dmabuf *dma);



int videobuf_dma_map(struct videobuf_queue *q, struct videobuf_dmabuf *dma);

int videobuf_dma_sync(struct videobuf_queue *q, struct videobuf_dmabuf *dma);

int videobuf_dma_unmap(struct videobuf_queue *q, struct videobuf_dmabuf *dma);

struct videobuf_dmabuf *videobuf_to_dma(struct videobuf_buffer *buf);