diff options
Diffstat (limited to 'drivers/media/radio/radio-rtrack2.c')
-rw-r--r-- | drivers/media/radio/radio-rtrack2.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c index 4234f7ed0fc3..a67079777419 100644 --- a/drivers/media/radio/radio-rtrack2.c +++ b/drivers/media/radio/radio-rtrack2.c | |||
@@ -154,8 +154,7 @@ static int rt_getsigstr(struct rt_device *dev) | |||
154 | static int vidioc_g_tuner(struct file *file, void *priv, | 154 | static int vidioc_g_tuner(struct file *file, void *priv, |
155 | struct v4l2_tuner *v) | 155 | struct v4l2_tuner *v) |
156 | { | 156 | { |
157 | struct video_device *dev = video_devdata(file); | 157 | struct rt_device *rt = video_drvdata(file); |
158 | struct rt_device *rt = video_get_drvdata(dev); | ||
159 | 158 | ||
160 | if (v->index > 0) | 159 | if (v->index > 0) |
161 | return -EINVAL; | 160 | return -EINVAL; |
@@ -174,8 +173,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
174 | static int vidioc_s_frequency(struct file *file, void *priv, | 173 | static int vidioc_s_frequency(struct file *file, void *priv, |
175 | struct v4l2_frequency *f) | 174 | struct v4l2_frequency *f) |
176 | { | 175 | { |
177 | struct video_device *dev = video_devdata(file); | 176 | struct rt_device *rt = video_drvdata(file); |
178 | struct rt_device *rt = video_get_drvdata(dev); | ||
179 | 177 | ||
180 | rt->curfreq = f->frequency; | 178 | rt->curfreq = f->frequency; |
181 | rt_setfreq(rt, rt->curfreq); | 179 | rt_setfreq(rt, rt->curfreq); |
@@ -185,8 +183,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, | |||
185 | static int vidioc_g_frequency(struct file *file, void *priv, | 183 | static int vidioc_g_frequency(struct file *file, void *priv, |
186 | struct v4l2_frequency *f) | 184 | struct v4l2_frequency *f) |
187 | { | 185 | { |
188 | struct video_device *dev = video_devdata(file); | 186 | struct rt_device *rt = video_drvdata(file); |
189 | struct rt_device *rt = video_get_drvdata(dev); | ||
190 | 187 | ||
191 | f->type = V4L2_TUNER_RADIO; | 188 | f->type = V4L2_TUNER_RADIO; |
192 | f->frequency = rt->curfreq; | 189 | f->frequency = rt->curfreq; |
@@ -211,8 +208,7 @@ static int vidioc_queryctrl(struct file *file, void *priv, | |||
211 | static int vidioc_g_ctrl(struct file *file, void *priv, | 208 | static int vidioc_g_ctrl(struct file *file, void *priv, |
212 | struct v4l2_control *ctrl) | 209 | struct v4l2_control *ctrl) |
213 | { | 210 | { |
214 | struct video_device *dev = video_devdata(file); | 211 | struct rt_device *rt = video_drvdata(file); |
215 | struct rt_device *rt = video_get_drvdata(dev); | ||
216 | 212 | ||
217 | switch (ctrl->id) { | 213 | switch (ctrl->id) { |
218 | case V4L2_CID_AUDIO_MUTE: | 214 | case V4L2_CID_AUDIO_MUTE: |
@@ -231,8 +227,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv, | |||
231 | static int vidioc_s_ctrl(struct file *file, void *priv, | 227 | static int vidioc_s_ctrl(struct file *file, void *priv, |
232 | struct v4l2_control *ctrl) | 228 | struct v4l2_control *ctrl) |
233 | { | 229 | { |
234 | struct video_device *dev = video_devdata(file); | 230 | struct rt_device *rt = video_drvdata(file); |
235 | struct rt_device *rt = video_get_drvdata(dev); | ||
236 | 231 | ||
237 | switch (ctrl->id) { | 232 | switch (ctrl->id) { |
238 | case V4L2_CID_AUDIO_MUTE: | 233 | case V4L2_CID_AUDIO_MUTE: |