diff options
| author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-11-08 21:37:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 07:56:22 -0800 |
| commit | 1a9ca74d22065355d61bb6395590378040e7366d (patch) | |
| tree | 1be03de84590cf27b20d78121db0b59bc3ef4db0 | |
| parent | 86bb4a215d152111f20daeb2a530f064afee8542 (diff) | |
| download | kernel_samsung_espresso10-1a9ca74d22065355d61bb6395590378040e7366d.zip kernel_samsung_espresso10-1a9ca74d22065355d61bb6395590378040e7366d.tar.gz kernel_samsung_espresso10-1a9ca74d22065355d61bb6395590378040e7366d.tar.bz2 | |
[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.c | 1 | ||||
| -rw-r--r-- | include/linux/videodev.h | 10 | ||||
| -rw-r--r-- | include/linux/videodev2.h | 7 |
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 16a6d2d..06644e2 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, return -ENOMEM; } - dev->vdev->owner = THIS_MODULE; dev->vdev->type = VID_TYPE_CAPTURE; if (dev->has_tuner) dev->vdev->type |= VID_TYPE_TUNER; diff --git a/include/linux/videodev.h b/include/linux/videodev.h index 23276ce..392592a 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h @@ -27,16 +27,6 @@ video_device_remove_file(struct video_device *vfd, class_device_remove_file(&vfd->class_dev, attr); } -/* helper functions to access driver private data. */ -static inline void *video_get_drvdata(struct video_device *dev) -{ - return dev->priv; -} - -static inline void video_set_drvdata(struct video_device *dev, void *data) -{ - dev->priv = data; -} extern int video_exclusive_open(struct inode *inode, struct file *file); extern int video_exclusive_release(struct inode *inode, struct file *file); diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index df0f9a2..65829a5 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -50,13 +50,6 @@ struct video_device void (*release)(struct video_device *vfd); - /* obsolete -- fops->owner is used instead */ - struct module *owner; - /* dev->driver_data will be used instead some day. - * Use the video_{get|set}_drvdata() helper functions, - * so the switch over will be transparent for you. - * Or use {pci|usb}_{get|set}_drvdata() directly. */ - void *priv; /* for videodev.c intenal usage -- please don't touch */ int users; /* video_exclusive_{open|close} ... */ |