summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-queue.c
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-01-10 19:54:39 -0500
committerAndy Walls <awalls@radix.net>2009-01-10 19:54:39 -0500
commitd50048287e23437dfd89b36c72a1740dea721004 (patch)
treec82bd12f61170631a236b06e6577f95796ceb0e3 /linux/drivers/media/video/cx18/cx18-queue.c
parent4394cd88c2ef58fd78f2050408d64b01b022e808 (diff)
downloadmediapointer-dvb-s2-d50048287e23437dfd89b36c72a1740dea721004.tar.gz
mediapointer-dvb-s2-d50048287e23437dfd89b36c72a1740dea721004.tar.bz2
cx18: Rename structure members: dev to pci_dev and v4l2dev to video_dev
From: Andy Walls <awalls@radix.net> Renamed structure member name to be more specific to type in anticipation of updating to the v4l2_device/v4l2_subdev framework. Too many objects named "dev" and /v4l2_\{0,1\}dev/ would be to confusing. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-queue.c')
-rw-r--r--linux/drivers/media/video/cx18/cx18-queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-queue.c b/linux/drivers/media/video/cx18/cx18-queue.c
index 8d9441e88..3046b8e74 100644
--- a/linux/drivers/media/video/cx18/cx18-queue.c
+++ b/linux/drivers/media/video/cx18/cx18-queue.c
@@ -204,7 +204,7 @@ int cx18_stream_alloc(struct cx18_stream *s)
}
buf->id = cx->buffer_id++;
INIT_LIST_HEAD(&buf->list);
- buf->dma_handle = pci_map_single(s->cx->dev,
+ buf->dma_handle = pci_map_single(s->cx->pci_dev,
buf->buf, s->buf_size, s->dma);
cx18_buf_sync_for_cpu(s, buf);
cx18_enqueue(s, buf, &s->q_free);
@@ -227,7 +227,7 @@ void cx18_stream_free(struct cx18_stream *s)
/* empty q_free */
while ((buf = cx18_dequeue(s, &s->q_free))) {
- pci_unmap_single(s->cx->dev, buf->dma_handle,
+ pci_unmap_single(s->cx->pci_dev, buf->dma_handle,
s->buf_size, s->dma);
kfree(buf->buf);
kfree(buf);