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/saa7134 | |
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/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index cfee84ee7a88..f3e7a598e4b5 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -798,7 +798,7 @@ static struct video_device *vdev_init(struct saa7134_dev *dev, | |||
798 | return NULL; | 798 | return NULL; |
799 | *vfd = *template; | 799 | *vfd = *template; |
800 | vfd->minor = -1; | 800 | vfd->minor = -1; |
801 | vfd->dev = &dev->pci->dev; | 801 | vfd->parent = &dev->pci->dev; |
802 | vfd->release = video_device_release; | 802 | vfd->release = video_device_release; |
803 | vfd->debug = video_debug; | 803 | vfd->debug = video_debug; |
804 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", | 804 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 2a5ab957542d..3854cc29752d 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -465,7 +465,7 @@ static int empress_init(struct saa7134_dev *dev) | |||
465 | if (NULL == dev->empress_dev) | 465 | if (NULL == dev->empress_dev) |
466 | return -ENOMEM; | 466 | return -ENOMEM; |
467 | *(dev->empress_dev) = saa7134_empress_template; | 467 | *(dev->empress_dev) = saa7134_empress_template; |
468 | dev->empress_dev->dev = &dev->pci->dev; | 468 | dev->empress_dev->parent = &dev->pci->dev; |
469 | dev->empress_dev->release = video_device_release; | 469 | dev->empress_dev->release = video_device_release; |
470 | snprintf(dev->empress_dev->name, sizeof(dev->empress_dev->name), | 470 | snprintf(dev->empress_dev->name, sizeof(dev->empress_dev->name), |
471 | "%s empress (%s)", dev->name, | 471 | "%s empress (%s)", dev->name, |