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>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/ivtv/ivtv-queue.c b/drivers/media/video/ivtv/ivtv-queue.c
index 71bd13e22e2e..ff7b7deded4f 100644
--- a/drivers/media/video/ivtv/ivtv-queue.c
+++ b/drivers/media/video/ivtv/ivtv-queue.c
@@ -230,7 +230,7 @@ int ivtv_stream_alloc(struct ivtv_stream *s)
                 return -ENOMEM;
         }
         if (ivtv_might_use_dma(s)) {
-                s->sg_handle = pci_map_single(itv->dev, s->sg_dma, sizeof(struct ivtv_sg_element), s->dma);
+                s->sg_handle = pci_map_single(itv->pdev, s->sg_dma, sizeof(struct ivtv_sg_element), s->dma);
                 ivtv_stream_sync_for_cpu(s);
         }
 
@@ -248,7 +248,7 @@ int ivtv_stream_alloc(struct ivtv_stream *s)
                 }
                 INIT_LIST_HEAD(&buf->list);
                 if (ivtv_might_use_dma(s)) {
-                        buf->dma_handle = pci_map_single(s->itv->dev,
+                        buf->dma_handle = pci_map_single(s->itv->pdev,
                                 buf->buf, s->buf_size + 256, s->dma);
                         ivtv_buf_sync_for_cpu(s, buf);
                 }
@@ -271,7 +271,7 @@ void ivtv_stream_free(struct ivtv_stream *s)
         /* empty q_free */
         while ((buf = ivtv_dequeue(s, &s->q_free))) {
                 if (ivtv_might_use_dma(s))
-                        pci_unmap_single(s->itv->dev, buf->dma_handle,
+                        pci_unmap_single(s->itv->pdev, buf->dma_handle,
                                 s->buf_size + 256, s->dma);
                 kfree(buf->buf);
                 kfree(buf);
@@ -280,7 +280,7 @@ void ivtv_stream_free(struct ivtv_stream *s)
         /* Free SG Array/Lists */
         if (s->sg_dma != NULL) {
                 if (s->sg_handle != IVTV_DMA_UNMAPPED) {
-                        pci_unmap_single(s->itv->dev, s->sg_handle,
+                        pci_unmap_single(s->itv->pdev, s->sg_handle,
                                  sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE);
                         s->sg_handle = IVTV_DMA_UNMAPPED;
                 }