UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2014-08-29 05:40:47 -03:00 committed by Mauro Carvalho Chehab
parent eddd326320
commit 999b3ceb84
7 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/pci/cx88/cx88-blackbird.c
View File

@ -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);
}

7
drivers/media/pci/cx88/cx88-core.c
View File

@ -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);

2
drivers/media/pci/cx88/cx88-dvb.c
View File

@ -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);
}

6
drivers/media/pci/cx88/cx88-mpeg.c
View File

@ -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;
}

2
drivers/media/pci/cx88/cx88-vbi.c
View File

@ -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);
}

2
drivers/media/pci/cx88/cx88-video.c
View File

@ -506,7 +506,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);
}

2
drivers/media/pci/cx88/cx88.h
View File

@ -624,8 +624,6 @@ extern int
cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
struct scatterlist *sglist, unsigned int bpl,
unsigned int lines, unsigned int lpi);
extern void
cx88_free_buffer(struct vb2_queue *q, struct cx88_buffer *buf);
extern void cx88_risc_disasm(struct cx88_core *core,
struct btcx_riscmem *risc);