diff options
Diffstat (limited to 'drivers/media/radio/radio-sf16fmi.c')
-rw-r--r-- | drivers/media/radio/radio-sf16fmi.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c index 810c366b73b0..329c90bddadd 100644 --- a/drivers/media/radio/radio-sf16fmi.c +++ b/drivers/media/radio/radio-sf16fmi.c | |||
@@ -147,8 +147,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
147 | struct v4l2_tuner *v) | 147 | struct v4l2_tuner *v) |
148 | { | 148 | { |
149 | int mult; | 149 | int mult; |
150 | struct video_device *dev = video_devdata(file); | 150 | struct fmi_device *fmi = video_drvdata(file); |
151 | struct fmi_device *fmi = video_get_drvdata(dev); | ||
152 | 151 | ||
153 | if (v->index > 0) | 152 | if (v->index > 0) |
154 | return -EINVAL; | 153 | return -EINVAL; |
@@ -176,8 +175,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, | |||
176 | static int vidioc_s_frequency(struct file *file, void *priv, | 175 | static int vidioc_s_frequency(struct file *file, void *priv, |
177 | struct v4l2_frequency *f) | 176 | struct v4l2_frequency *f) |
178 | { | 177 | { |
179 | struct video_device *dev = video_devdata(file); | 178 | struct fmi_device *fmi = video_drvdata(file); |
180 | struct fmi_device *fmi = video_get_drvdata(dev); | ||
181 | 179 | ||
182 | if (!(fmi->flags & V4L2_TUNER_CAP_LOW)) | 180 | if (!(fmi->flags & V4L2_TUNER_CAP_LOW)) |
183 | f->frequency *= 1000; | 181 | f->frequency *= 1000; |
@@ -194,8 +192,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, | |||
194 | static int vidioc_g_frequency(struct file *file, void *priv, | 192 | static int vidioc_g_frequency(struct file *file, void *priv, |
195 | struct v4l2_frequency *f) | 193 | struct v4l2_frequency *f) |
196 | { | 194 | { |
197 | struct video_device *dev = video_devdata(file); | 195 | struct fmi_device *fmi = video_drvdata(file); |
198 | struct fmi_device *fmi = video_get_drvdata(dev); | ||
199 | 196 | ||
200 | f->type = V4L2_TUNER_RADIO; | 197 | f->type = V4L2_TUNER_RADIO; |
201 | f->frequency = fmi->curfreq; | 198 | f->frequency = fmi->curfreq; |
@@ -222,8 +219,7 @@ static int vidioc_queryctrl(struct file *file, void *priv, | |||
222 | static int vidioc_g_ctrl(struct file *file, void *priv, | 219 | static int vidioc_g_ctrl(struct file *file, void *priv, |
223 | struct v4l2_control *ctrl) | 220 | struct v4l2_control *ctrl) |
224 | { | 221 | { |
225 | struct video_device *dev = video_devdata(file); | 222 | struct fmi_device *fmi = video_drvdata(file); |
226 | struct fmi_device *fmi = video_get_drvdata(dev); | ||
227 | 223 | ||
228 | switch (ctrl->id) { | 224 | switch (ctrl->id) { |
229 | case V4L2_CID_AUDIO_MUTE: | 225 | case V4L2_CID_AUDIO_MUTE: |
@@ -236,8 +232,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv, | |||
236 | static int vidioc_s_ctrl(struct file *file, void *priv, | 232 | static int vidioc_s_ctrl(struct file *file, void *priv, |
237 | struct v4l2_control *ctrl) | 233 | struct v4l2_control *ctrl) |
238 | { | 234 | { |
239 | struct video_device *dev = video_devdata(file); | 235 | struct fmi_device *fmi = video_drvdata(file); |
240 | struct fmi_device *fmi = video_get_drvdata(dev); | ||
241 | 236 | ||
242 | switch (ctrl->id) { | 237 | switch (ctrl->id) { |
243 | case V4L2_CID_AUDIO_MUTE: | 238 | case V4L2_CID_AUDIO_MUTE: |