aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:37:54 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:22 -0500
commit1a9ca74d22065355d61bb6395590378040e7366d (patch)
tree1be03de84590cf27b20d78121db0b59bc3ef4db0
parent86bb4a215d152111f20daeb2a530f064afee8542 (diff)
[PATCH] v4l: 815: commented obsoleted stuff at videodev headers
- Commented obsoleted stuff at videodev headers. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c1
-rw-r--r--include/linux/videodev.h10
-rw-r--r--include/linux/videodev2.h7
3 files changed, 0 insertions, 18 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 16a6d2da7391..06644e230b47 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1671,7 +1671,6 @@ static int em2820_init_dev(struct em2820 **devhandle, struct usb_device *udev,
1671 return -ENOMEM; 1671 return -ENOMEM;
1672 } 1672 }
1673 1673
1674 dev->vdev->owner = THIS_MODULE;
1675 dev->vdev->type = VID_TYPE_CAPTURE; 1674 dev->vdev->type = VID_TYPE_CAPTURE;
1676 if (dev->has_tuner) 1675 if (dev->has_tuner)
1677 dev->vdev->type |= VID_TYPE_TUNER; 1676 dev->vdev->type |= VID_TYPE_TUNER;
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 23276cede540..392592a040c5 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -27,16 +27,6 @@ video_device_remove_file(struct video_device *vfd,
27 class_device_remove_file(&vfd->class_dev, attr); 27 class_device_remove_file(&vfd->class_dev, attr);
28} 28}
29 29
30/* helper functions to access driver private data. */
31static inline void *video_get_drvdata(struct video_device *dev)
32{
33 return dev->priv;
34}
35
36static inline void video_set_drvdata(struct video_device *dev, void *data)
37{
38 dev->priv = data;
39}
40 30
41extern int video_exclusive_open(struct inode *inode, struct file *file); 31extern int video_exclusive_open(struct inode *inode, struct file *file);
42extern int video_exclusive_release(struct inode *inode, struct file *file); 32extern int video_exclusive_release(struct inode *inode, struct file *file);
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index df0f9a24944a..65829a510aca 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -50,13 +50,6 @@ struct video_device
50 void (*release)(struct video_device *vfd); 50 void (*release)(struct video_device *vfd);
51 51
52 52
53 /* obsolete -- fops->owner is used instead */
54 struct module *owner;
55 /* dev->driver_data will be used instead some day.
56 * Use the video_{get|set}_drvdata() helper functions,
57 * so the switch over will be transparent for you.
58 * Or use {pci|usb}_{get|set}_drvdata() directly. */
59 void *priv;
60 53
61 /* for videodev.c intenal usage -- please don't touch */ 54 /* for videodev.c intenal usage -- please don't touch */
62 int users; /* video_exclusive_{open|close} ... */ 55 int users; /* video_exclusive_{open|close} ... */