diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-20 11:31:39 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-20 11:31:39 +0200 |
| commit | bcc38c16d5b89d3e0303fd38b255fe1d753802fc (patch) | |
| tree | 4927627c6afc6b25e5d337455be7c085b776c5ae /linux/drivers/media/video/saa7134 | |
| parent | 14bb5adb5fe97f906d8647dd565965d71c433e81 (diff) | |
| download | mediapointer-dvb-s2-bcc38c16d5b89d3e0303fd38b255fe1d753802fc.tar.gz mediapointer-dvb-s2-bcc38c16d5b89d3e0303fd38b255fe1d753802fc.tar.bz2 | |
videodev: rename 'dev' to 'parent'
From: Hans Verkuil <hverkuil@xs4all.nl>
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>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 8f3d280af..254a04717 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -859,7 +859,7 @@ static struct video_device *vdev_init(struct saa7134_dev *dev, return NULL; *vfd = *template; vfd->minor = -1; - vfd->dev = &dev->pci->dev; + vfd->parent = &dev->pci->dev; vfd->release = video_device_release; vfd->debug = video_debug; snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index d4afbce9d..dc3c2a6cb 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -473,7 +473,7 @@ static int empress_init(struct saa7134_dev *dev) if (NULL == dev->empress_dev) return -ENOMEM; *(dev->empress_dev) = saa7134_empress_template; - dev->empress_dev->dev = &dev->pci->dev; + dev->empress_dev->parent = &dev->pci->dev; dev->empress_dev->release = video_device_release; snprintf(dev->empress_dev->name, sizeof(dev->empress_dev->name), "%s empress (%s)", dev->name, |