media: Remove usage of the deprecated "pci-dma-compat.h" API
In [1], Christoph Hellwig has proposed to remove the wrappers in include/linux/pci-dma-compat.h. Some reasons why this API should be removed have been given by Julia Lawall in [2]. A coccinelle script has been used to perform the needed transformation. It can be found in [3]. [1]: https://lore.kernel.org/kernel-janitors/20200421081257.GA131897@infradead.org/ [2]: https://lore.kernel.org/kernel-janitors/alpine.DEB.2.22.394.2007120902170.2424@hadrien/ [3]: https://lore.kernel.org/kernel-janitors/20200716192821.321233-1-christophe.jaillet@wanadoo.fr/ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Mauro Carvalho Chehab <mchehab@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Родитель
a53becd1eb
Коммит
4e541b06b0
|
@ -15,15 +15,15 @@
|
|||
static inline void cx18_buf_sync_for_cpu(struct cx18_stream *s,
|
||||
struct cx18_buffer *buf)
|
||||
{
|
||||
pci_dma_sync_single_for_cpu(s->cx->pci_dev, buf->dma_handle,
|
||||
dma_sync_single_for_cpu(&s->cx->pci_dev->dev, buf->dma_handle,
|
||||
s->buf_size, s->dma);
|
||||
}
|
||||
|
||||
static inline void cx18_buf_sync_for_device(struct cx18_stream *s,
|
||||
struct cx18_buffer *buf)
|
||||
{
|
||||
pci_dma_sync_single_for_device(s->cx->pci_dev, buf->dma_handle,
|
||||
s->buf_size, s->dma);
|
||||
dma_sync_single_for_device(&s->cx->pci_dev->dev, buf->dma_handle,
|
||||
s->buf_size, s->dma);
|
||||
}
|
||||
|
||||
void _cx18_mdl_sync_for_device(struct cx18_stream *s, struct cx18_mdl *mdl);
|
||||
|
|
|
@ -17,20 +17,20 @@
|
|||
|
||||
static inline int ivtv_might_use_pio(struct ivtv_stream *s)
|
||||
{
|
||||
return s->dma == PCI_DMA_NONE || (SLICED_VBI_PIO && s->type == IVTV_ENC_STREAM_TYPE_VBI);
|
||||
return s->dma == DMA_NONE || (SLICED_VBI_PIO && s->type == IVTV_ENC_STREAM_TYPE_VBI);
|
||||
}
|
||||
|
||||
static inline int ivtv_use_pio(struct ivtv_stream *s)
|
||||
{
|
||||
struct ivtv *itv = s->itv;
|
||||
|
||||
return s->dma == PCI_DMA_NONE ||
|
||||
return s->dma == DMA_NONE ||
|
||||
(SLICED_VBI_PIO && s->type == IVTV_ENC_STREAM_TYPE_VBI && itv->vbi.sliced_in->service_set);
|
||||
}
|
||||
|
||||
static inline int ivtv_might_use_dma(struct ivtv_stream *s)
|
||||
{
|
||||
return s->dma != PCI_DMA_NONE;
|
||||
return s->dma != DMA_NONE;
|
||||
}
|
||||
|
||||
static inline int ivtv_use_dma(struct ivtv_stream *s)
|
||||
|
@ -41,15 +41,16 @@ static inline int ivtv_use_dma(struct ivtv_stream *s)
|
|||
static inline void ivtv_buf_sync_for_cpu(struct ivtv_stream *s, struct ivtv_buffer *buf)
|
||||
{
|
||||
if (ivtv_use_dma(s))
|
||||
pci_dma_sync_single_for_cpu(s->itv->pdev, buf->dma_handle,
|
||||
s->buf_size + 256, s->dma);
|
||||
dma_sync_single_for_cpu(&s->itv->pdev->dev, buf->dma_handle,
|
||||
s->buf_size + 256, s->dma);
|
||||
}
|
||||
|
||||
static inline void ivtv_buf_sync_for_device(struct ivtv_stream *s, struct ivtv_buffer *buf)
|
||||
{
|
||||
if (ivtv_use_dma(s))
|
||||
pci_dma_sync_single_for_device(s->itv->pdev, buf->dma_handle,
|
||||
s->buf_size + 256, s->dma);
|
||||
dma_sync_single_for_device(&s->itv->pdev->dev,
|
||||
buf->dma_handle, s->buf_size + 256,
|
||||
s->dma);
|
||||
}
|
||||
|
||||
int ivtv_buf_copy_from_user(struct ivtv_stream *s, struct ivtv_buffer *buf, const char __user *src, int copybytes);
|
||||
|
@ -70,15 +71,17 @@ void ivtv_stream_free(struct ivtv_stream *s);
|
|||
static inline void ivtv_stream_sync_for_cpu(struct ivtv_stream *s)
|
||||
{
|
||||
if (ivtv_use_dma(s))
|
||||
pci_dma_sync_single_for_cpu(s->itv->pdev, s->sg_handle,
|
||||
sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE);
|
||||
dma_sync_single_for_cpu(&s->itv->pdev->dev, s->sg_handle,
|
||||
sizeof(struct ivtv_sg_element),
|
||||
DMA_TO_DEVICE);
|
||||
}
|
||||
|
||||
static inline void ivtv_stream_sync_for_device(struct ivtv_stream *s)
|
||||
{
|
||||
if (ivtv_use_dma(s))
|
||||
pci_dma_sync_single_for_device(s->itv->pdev, s->sg_handle,
|
||||
sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE);
|
||||
dma_sync_single_for_device(&s->itv->pdev->dev, s->sg_handle,
|
||||
sizeof(struct ivtv_sg_element),
|
||||
DMA_TO_DEVICE);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -23,14 +23,14 @@ void ivtv_udma_start(struct ivtv *itv);
|
|||
|
||||
static inline void ivtv_udma_sync_for_device(struct ivtv *itv)
|
||||
{
|
||||
pci_dma_sync_single_for_device(itv->pdev, itv->udma.SG_handle,
|
||||
sizeof(itv->udma.SGarray), PCI_DMA_TODEVICE);
|
||||
dma_sync_single_for_device(&itv->pdev->dev, itv->udma.SG_handle,
|
||||
sizeof(itv->udma.SGarray), DMA_TO_DEVICE);
|
||||
}
|
||||
|
||||
static inline void ivtv_udma_sync_for_cpu(struct ivtv *itv)
|
||||
{
|
||||
pci_dma_sync_single_for_cpu(itv->pdev, itv->udma.SG_handle,
|
||||
sizeof(itv->udma.SGarray), PCI_DMA_TODEVICE);
|
||||
dma_sync_single_for_cpu(&itv->pdev->dev, itv->udma.SG_handle,
|
||||
sizeof(itv->udma.SGarray), DMA_TO_DEVICE);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче