diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-20 11:35:02 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-20 11:35:02 +0200 |
| commit | 2823a672c698095820a3512be8a22988777b40c4 (patch) | |
| tree | 79418df0e952627a94fe5900122a0e16d35a87bf /linux/drivers/media/video/bt8xx/bttv-driver.c | |
| parent | bcc38c16d5b89d3e0303fd38b255fe1d753802fc (diff) | |
| download | mediapointer-dvb-s2-2823a672c698095820a3512be8a22988777b40c4.tar.gz mediapointer-dvb-s2-2823a672c698095820a3512be8a22988777b40c4.tar.bz2 | |
videodev: renamed 'class_dev' to 'dev'
From: Hans Verkuil <hverkuil@xs4all.nl>
The class_dev field is a normal device, not a class device. This is very
confusing and now that the old 'dev' field has been renamed to 'parent'
we can rename 'class_dev' to just 'dev'.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 47e4c1fae..d756f8ab4 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -163,7 +163,7 @@ MODULE_LICENSE("GPL"); static ssize_t show_card(struct device *cd, struct device_attribute *attr, char *buf) { - struct video_device *vfd = container_of(cd, struct video_device, class_dev); + struct video_device *vfd = container_of(cd, struct video_device, dev); struct bttv *btv = dev_get_drvdata(vfd->parent); return sprintf(buf, "%d\n", btv ? btv->c.type : UNSET); } @@ -4268,7 +4268,7 @@ static int __devinit bttv_register_video(struct bttv *btv) goto err; printk(KERN_INFO "bttv%d: registered device video%d\n", btv->c.nr,btv->video_dev->minor & 0x1f); - if (device_create_file(&btv->video_dev->class_dev, + if (device_create_file(&btv->video_dev->dev, &dev_attr_card)<0) { printk(KERN_ERR "bttv%d: device_create_file 'card' " "failed\n", btv->c.nr); |