diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-07 05:02:27 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:41 -0400 |
commit | 8ac05ae3192ce8a71fc84e4a88772cce0c09173c (patch) | |
tree | 997f2d8bbedf857b33bf62d44b9cc4cd8c7a9f73 /drivers/media/video/ivtv/ivtv-queue.h | |
parent | d7493e518fa98d2c30c545c518df075903bae513 (diff) |
V4L/DVB (10488): ivtv: cleanup naming conventions
Use consistent naming for pci_dev, v4l2_device and video_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-queue.h')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-queue.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/ivtv/ivtv-queue.h b/drivers/media/video/ivtv/ivtv-queue.h index 476556afd39a..91233839a26c 100644 --- a/drivers/media/video/ivtv/ivtv-queue.h +++ b/drivers/media/video/ivtv/ivtv-queue.h | |||
@@ -53,14 +53,14 @@ static inline int ivtv_use_dma(struct ivtv_stream *s) | |||
53 | static inline void ivtv_buf_sync_for_cpu(struct ivtv_stream *s, struct ivtv_buffer *buf) | 53 | static inline void ivtv_buf_sync_for_cpu(struct ivtv_stream *s, struct ivtv_buffer *buf) |
54 | { | 54 | { |
55 | if (ivtv_use_dma(s)) | 55 | if (ivtv_use_dma(s)) |
56 | pci_dma_sync_single_for_cpu(s->itv->dev, buf->dma_handle, | 56 | pci_dma_sync_single_for_cpu(s->itv->pdev, buf->dma_handle, |
57 | s->buf_size + 256, s->dma); | 57 | s->buf_size + 256, s->dma); |
58 | } | 58 | } |
59 | 59 | ||
60 | static inline void ivtv_buf_sync_for_device(struct ivtv_stream *s, struct ivtv_buffer *buf) | 60 | static inline void ivtv_buf_sync_for_device(struct ivtv_stream *s, struct ivtv_buffer *buf) |
61 | { | 61 | { |
62 | if (ivtv_use_dma(s)) | 62 | if (ivtv_use_dma(s)) |
63 | pci_dma_sync_single_for_device(s->itv->dev, buf->dma_handle, | 63 | pci_dma_sync_single_for_device(s->itv->pdev, buf->dma_handle, |
64 | s->buf_size + 256, s->dma); | 64 | s->buf_size + 256, s->dma); |
65 | } | 65 | } |
66 | 66 | ||
@@ -82,14 +82,14 @@ void ivtv_stream_free(struct ivtv_stream *s); | |||
82 | static inline void ivtv_stream_sync_for_cpu(struct ivtv_stream *s) | 82 | static inline void ivtv_stream_sync_for_cpu(struct ivtv_stream *s) |
83 | { | 83 | { |
84 | if (ivtv_use_dma(s)) | 84 | if (ivtv_use_dma(s)) |
85 | pci_dma_sync_single_for_cpu(s->itv->dev, s->sg_handle, | 85 | pci_dma_sync_single_for_cpu(s->itv->pdev, s->sg_handle, |
86 | sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE); | 86 | sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE); |
87 | } | 87 | } |
88 | 88 | ||
89 | static inline void ivtv_stream_sync_for_device(struct ivtv_stream *s) | 89 | static inline void ivtv_stream_sync_for_device(struct ivtv_stream *s) |
90 | { | 90 | { |
91 | if (ivtv_use_dma(s)) | 91 | if (ivtv_use_dma(s)) |
92 | pci_dma_sync_single_for_device(s->itv->dev, s->sg_handle, | 92 | pci_dma_sync_single_for_device(s->itv->pdev, s->sg_handle, |
93 | sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE); | 93 | sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE); |
94 | } | 94 | } |
95 | 95 | ||