diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-23 12:24:07 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-23 12:24:07 +0200 |
| commit | da4e1aee344454f87d08d5914da4ec98f9824bdc (patch) | |
| tree | b0a3007feafcaf3931129a20b194f0c79618f43e /linux/drivers/media/video/usbvideo | |
| parent | 60c4198b31349257aac0d357d2026f7a10b8a4e8 (diff) | |
| download | mediapointer-dvb-s2-da4e1aee344454f87d08d5914da4ec98f9824bdc.tar.gz mediapointer-dvb-s2-da4e1aee344454f87d08d5914da4ec98f9824bdc.tar.bz2 | |
v4l2: remove the priv field, use dev_get_drvdata instead
From: Hans Verkuil <hverkuil@xs4all.nl>
Remove the priv field and let video_get/set_drvdata use dev_get_drvdata
and dev_set_drvdata instead.
Convert all drivers that still used priv directly.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/usbvideo')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/vicam.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux/drivers/media/video/usbvideo/vicam.c b/linux/drivers/media/video/usbvideo/vicam.c index e781ee46d..7d3b3362b 100644 --- a/linux/drivers/media/video/usbvideo/vicam.c +++ b/linux/drivers/media/video/usbvideo/vicam.c @@ -783,8 +783,8 @@ static int vicam_open(struct inode *inode, struct file *file) { struct video_device *dev = video_devdata(file); - struct vicam_camera *cam = - (struct vicam_camera *) dev->priv; + struct vicam_camera *cam = video_get_drvdata(dev); + DBG("open\n"); if (!cam) { @@ -1176,9 +1176,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id) mutex_init(&cam->cam_lock); - memcpy(&cam->vdev, &vicam_template, - sizeof (vicam_template)); - cam->vdev.priv = cam; // sort of a reverse mapping for those functions that get vdev only + memcpy(&cam->vdev, &vicam_template, sizeof(vicam_template)); + video_set_drvdata(&cam->vdev, cam); cam->udev = dev; cam->bulkEndpoint = bulkEndpoint; |