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

[deliverable/linux.git] / drivers / media / radio / radio-aztech.c

diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index ddd96295a9fe11695295d3c7fee27dd3aa80c7e6..5dd5e349ef47c22696b0fea79c72c5de5880d9ce 100644 (file)
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -197,7 +197,7 @@ static int vidioc_g_tuner (struct file *file, void *priv,
                                struct v4l2_tuner *v)
 {
        struct video_device *dev = video_devdata(file);
-       struct az_device *az = dev->priv;
+       struct az_device *az = video_get_drvdata(dev);
 
        if (v->index > 0)
                return -EINVAL;
@@ -266,7 +266,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
        struct video_device *dev = video_devdata(file);
-       struct az_device *az = dev->priv;
+       struct az_device *az = video_get_drvdata(dev);
 
        az->curfreq = f->frequency;
        az_setfreq(az, az->curfreq);
@@ -277,7 +277,7 @@ static int vidioc_g_frequency (struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
        struct video_device *dev = video_devdata(file);
-       struct az_device *az = dev->priv;
+       struct az_device *az = video_get_drvdata(dev);
 
        f->type = V4L2_TUNER_RADIO;
        f->frequency = az->curfreq;
@@ -304,7 +304,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv,
                            struct v4l2_control *ctrl)
 {
        struct video_device *dev = video_devdata(file);
-       struct az_device *az = dev->priv;
+       struct az_device *az = video_get_drvdata(dev);
 
        switch (ctrl->id) {
                case V4L2_CID_AUDIO_MUTE:
@@ -324,7 +324,7 @@ static int vidioc_s_ctrl (struct file *file, void *priv,
                            struct v4l2_control *ctrl)
 {
        struct video_device *dev = video_devdata(file);
-       struct az_device *az = dev->priv;
+       struct az_device *az = video_get_drvdata(dev);
 
        switch (ctrl->id) {
                case V4L2_CID_AUDIO_MUTE:
@@ -405,7 +405,7 @@ static int __init aztech_init(void)
        }
 
        mutex_init(&lock);
-       aztech_radio.priv=&aztech_unit;
+       video_set_drvdata(&aztech_radio, &aztech_unit);
 
        if (video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                release_region(io,2);