V4L/DVB (8786): v4l2: remove the priv field, use dev_get_drvdata instead

[deliverable/linux.git] / drivers / media / video / stk-webcam.c

diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index 6b1ef5dc562cbc850e08ca72430c59205d89bfff..8dda5680094d1f92eee131de4306bfa783ea0dd1 100644 (file)
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -72,7 +72,7 @@ static void stk_camera_cleanup(struct kref *kref)
        STK_INFO("Syntek USB2.0 Camera release resources"
                " video device /dev/video%d\n", dev->vdev.minor);
        video_unregister_device(&dev->vdev);
-       dev->vdev.priv = NULL;
+       video_set_drvdata(&dev->vdev, NULL);
 
        if (dev->sio_bufs != NULL || dev->isobufs != NULL)
                STK_ERROR("We are leaking memory\n");
@@ -1379,7 +1379,7 @@ static int stk_register_video_device(struct stk_camera *dev)
        dev->vdev = stk_v4l_data;
        dev->vdev.debug = debug;
        dev->vdev.parent = &dev->interface->dev;
-       dev->vdev.priv = dev;
+       video_set_drvdata(&dev->vdev, dev);
        err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
        if (err)
                STK_ERROR("v4l registration failed\n");