diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-20 05:31:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 15:42:49 -0400 |
commit | 5e85e732f0ed56aa97a3ba26ac2b93ffe597a208 (patch) | |
tree | 899da0a99112d5e1b66d49d8561680f716798541 /drivers/media/video/cx23885 | |
parent | 27a5e6d3fcce73ceeee8f3bdc9a30c4564233800 (diff) |
V4L/DVB (8428): videodev: rename 'dev' to 'parent'
The field 'dev' is not the video device, but the parent of the video device.
Rename accordingly.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-417.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c index e7ef093265af..1b252976edac 100644 --- a/drivers/media/video/cx23885/cx23885-417.c +++ b/drivers/media/video/cx23885/cx23885-417.c | |||
@@ -1766,7 +1766,7 @@ static struct video_device *cx23885_video_dev_alloc( | |||
1766 | vfd->minor = -1; | 1766 | vfd->minor = -1; |
1767 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name, | 1767 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name, |
1768 | type, cx23885_boards[tsport->dev->board].name); | 1768 | type, cx23885_boards[tsport->dev->board].name); |
1769 | vfd->dev = &pci->dev; | 1769 | vfd->parent = &pci->dev; |
1770 | vfd->release = video_device_release; | 1770 | vfd->release = video_device_release; |
1771 | return vfd; | 1771 | return vfd; |
1772 | } | 1772 | } |
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 043fc4e5c586..3b807ba874f1 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
@@ -326,7 +326,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev, | |||
326 | return NULL; | 326 | return NULL; |
327 | *vfd = *template; | 327 | *vfd = *template; |
328 | vfd->minor = -1; | 328 | vfd->minor = -1; |
329 | vfd->dev = &pci->dev; | 329 | vfd->parent = &pci->dev; |
330 | vfd->release = video_device_release; | 330 | vfd->release = video_device_release; |
331 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", | 331 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", |
332 | dev->name, type, cx23885_boards[dev->board].name); | 332 | dev->name, type, cx23885_boards[dev->board].name); |