media: ivtv: Access v4l2_fh from file

The v4l2_fh associated with an open file handle is now guaranteed
to be available in file->private_data, initialised by v4l2_fh_add().

Access the v4l2_fh, and from there the driver-specific structure,
from the file * in all ioctl handlers.

While at it remove the only left user of fh2id() and remove
the macro completely.

Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Co-developed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
index 3d84004d4e90f418caa5e119c6d25b5584909631..69c37f450c21f91abb4e4f73823097bd61d5abc2 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-driver.h
+++ b/drivers/media/pci/ivtv/ivtv-driver.h
@@ -384,14 +384,9 @@ struct ivtv_open_id {
        struct ivtv *itv;
 };
 
-static inline struct ivtv_open_id *fh2id(struct v4l2_fh *fh)
-{
-       return container_of(fh, struct ivtv_open_id, fh);
-}
-
 static inline struct ivtv_open_id *file2id(struct file *filp)
 {
-       return fh2id(file_to_v4l2_fh(filp));
+       return container_of(file_to_v4l2_fh(filp), struct ivtv_open_id, fh);
 }
 
 struct yuv_frame_info

diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv/ivtv-fileops.c
index 0040a5e7f654149eb429400dd1db7197a9a3b54e..814fe7989cdc11ed225f03a9168be50c6b9ba595 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-fileops.c
+++ b/drivers/media/pci/ivtv/ivtv-fileops.c
@@ -878,7 +878,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
 int ivtv_v4l2_close(struct file *filp)
 {
        struct v4l2_fh *fh = file_to_v4l2_fh(filp);
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(filp);
        struct ivtv *itv = id->itv;
        struct ivtv_stream *s = &itv->streams[id->type];
 

diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index d888435b71fb6f6873d9d884248a67364576bf33..8077a71d4850ec773caa20c3fca08f92f3117d69 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -308,7 +308,7 @@ static int ivtv_video_command(struct ivtv *itv, struct ivtv_open_id *id,
 
 static int ivtv_g_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
        struct v4l2_sliced_vbi_format *vbifmt = &fmt->fmt.sliced;
 
        vbifmt->reserved[0] = 0;
@@ -330,7 +330,7 @@ static int ivtv_g_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_fo
 
 static int ivtv_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
        struct v4l2_pix_format *pixfmt = &fmt->fmt.pix;
 
@@ -353,7 +353,7 @@ static int ivtv_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
 
 static int ivtv_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
        struct v4l2_vbi_format *vbifmt = &fmt->fmt.vbi;
 
        vbifmt->sampling_rate = 27000000;
@@ -372,7 +372,7 @@ static int ivtv_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f
 static int ivtv_g_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt)
 {
        struct v4l2_sliced_vbi_format *vbifmt = &fmt->fmt.sliced;
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
 
        vbifmt->reserved[0] = 0;
@@ -394,7 +394,7 @@ static int ivtv_g_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo
 
 static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
        struct v4l2_pix_format *pixfmt = &fmt->fmt.pix;
 
@@ -434,8 +434,8 @@ static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f
 
 static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv *itv = file2id(file)->itv;
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
        struct v4l2_window *winfmt = &fmt->fmt.win;
 
        if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
@@ -461,7 +461,7 @@ static int ivtv_try_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_
 
 static int ivtv_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
        int w = fmt->fmt.pix.width;
        int h = fmt->fmt.pix.height;
@@ -490,7 +490,7 @@ static int ivtv_try_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format
 static int ivtv_try_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt)
 {
        struct v4l2_sliced_vbi_format *vbifmt = &fmt->fmt.sliced;
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
 
        if (id->type == IVTV_DEC_STREAM_TYPE_VBI)
@@ -510,7 +510,7 @@ static int ivtv_try_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_
 
 static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        s32 w = fmt->fmt.pix.width;
        s32 h = fmt->fmt.pix.height;
        int field = fmt->fmt.pix.field;
@@ -544,8 +544,8 @@ static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format
 
 static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv *itv = file2id(file)->itv;
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
        u32 chromakey = fmt->fmt.win.chromakey;
        u8 global_alpha = fmt->fmt.win.global_alpha;
 
@@ -566,7 +566,7 @@ static int ivtv_s_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_fo
 
 static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
        struct v4l2_subdev_format format = {
                .which = V4L2_SUBDEV_FORMAT_ACTIVE,
@@ -597,7 +597,7 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
 
 static int ivtv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        if (!ivtv_raw_vbi(itv) && atomic_read(&itv->capturing) > 0)
                return -EBUSY;
@@ -610,7 +610,7 @@ static int ivtv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f
 static int ivtv_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt)
 {
        struct v4l2_sliced_vbi_format *vbifmt = &fmt->fmt.sliced;
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
        int ret = ivtv_try_fmt_sliced_vbi_cap(file, fh, fmt);
 
@@ -628,7 +628,7 @@ static int ivtv_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo
 
 static int ivtv_s_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
        struct yuv_playback_info *yi = &itv->yuv_info;
        int ret = ivtv_try_fmt_vid_out(file, fh, fmt);
@@ -673,7 +673,7 @@ static int ivtv_s_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f
 
 static int ivtv_s_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
        int ret = ivtv_try_fmt_vid_out_overlay(file, fh, fmt);
 
        if (ret == 0) {
@@ -710,7 +710,7 @@ static int ivtv_itvc(struct ivtv *itv, bool get, u64 reg, u64 *val)
 
 static int ivtv_g_register(struct file *file, void *fh, struct v4l2_dbg_register *reg)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        reg->size = 4;
        return ivtv_itvc(itv, true, reg->reg, &reg->val);
@@ -718,7 +718,7 @@ static int ivtv_g_register(struct file *file, void *fh, struct v4l2_dbg_register
 
 static int ivtv_s_register(struct file *file, void *fh, const struct v4l2_dbg_register *reg)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
        u64 val = reg->val;
 
        return ivtv_itvc(itv, false, reg->reg, &val);
@@ -727,7 +727,7 @@ static int ivtv_s_register(struct file *file, void *fh, const struct v4l2_dbg_re
 
 static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vcap)
 {
-       struct ivtv_open_id *id = fh2id(file_to_v4l2_fh(file));
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
 
        strscpy(vcap->driver, IVTV_DRIVER_NAME, sizeof(vcap->driver));
@@ -738,14 +738,14 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc
 
 static int ivtv_enumaudio(struct file *file, void *fh, struct v4l2_audio *vin)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        return ivtv_get_audio_input(itv, vin->index, vin);
 }
 
 static int ivtv_g_audio(struct file *file, void *fh, struct v4l2_audio *vin)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        vin->index = itv->audio_input;
        return ivtv_get_audio_input(itv, vin->index, vin);
@@ -753,7 +753,7 @@ static int ivtv_g_audio(struct file *file, void *fh, struct v4l2_audio *vin)
 
 static int ivtv_s_audio(struct file *file, void *fh, const struct v4l2_audio *vout)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        if (vout->index >= itv->nof_audio_inputs)
                return -EINVAL;
@@ -766,7 +766,7 @@ static int ivtv_s_audio(struct file *file, void *fh, const struct v4l2_audio *vo
 
 static int ivtv_enumaudout(struct file *file, void *fh, struct v4l2_audioout *vin)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        /* set it to defaults from our table */
        return ivtv_get_audio_output(itv, vin->index, vin);
@@ -774,7 +774,7 @@ static int ivtv_enumaudout(struct file *file, void *fh, struct v4l2_audioout *vi
 
 static int ivtv_g_audout(struct file *file, void *fh, struct v4l2_audioout *vin)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        vin->index = 0;
        return ivtv_get_audio_output(itv, vin->index, vin);
@@ -782,7 +782,7 @@ static int ivtv_g_audout(struct file *file, void *fh, struct v4l2_audioout *vin)
 
 static int ivtv_s_audout(struct file *file, void *fh, const struct v4l2_audioout *vout)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        if (itv->card->video_outputs == NULL || vout->index != 0)
                return -EINVAL;
@@ -791,7 +791,7 @@ static int ivtv_s_audout(struct file *file, void *fh, const struct v4l2_audioout
 
 static int ivtv_enum_input(struct file *file, void *fh, struct v4l2_input *vin)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        /* set it to defaults from our table */
        return ivtv_get_input(itv, vin->index, vin);
@@ -799,7 +799,7 @@ static int ivtv_enum_input(struct file *file, void *fh, struct v4l2_input *vin)
 
 static int ivtv_enum_output(struct file *file, void *fh, struct v4l2_output *vout)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        return ivtv_get_output(itv, vout->index, vout);
 }
@@ -807,7 +807,7 @@ static int ivtv_enum_output(struct file *file, void *fh, struct v4l2_output *vou
 static int ivtv_g_pixelaspect(struct file *file, void *fh,
                              int type, struct v4l2_fract *f)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
 
        if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
@@ -825,7 +825,7 @@ static int ivtv_g_pixelaspect(struct file *file, void *fh,
 static int ivtv_s_selection(struct file *file, void *fh,
                            struct v4l2_selection *sel)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
        struct yuv_playback_info *yi = &itv->yuv_info;
        struct v4l2_rect r = { 0, 0, 720, 0 };
@@ -868,7 +868,7 @@ static int ivtv_s_selection(struct file *file, void *fh,
 static int ivtv_g_selection(struct file *file, void *fh,
                            struct v4l2_selection *sel)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
        struct yuv_playback_info *yi = &itv->yuv_info;
        struct v4l2_rect r = { 0, 0, 720, 0 };
@@ -924,8 +924,8 @@ static int ivtv_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdes
                .description = "MPEG",
                .pixelformat = V4L2_PIX_FMT_MPEG,
        };
-       struct ivtv *itv = fh2id(fh)->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv *itv = file2id(file)->itv;
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
 
        if (fmt->index)
                return -EINVAL;
@@ -951,8 +951,8 @@ static int ivtv_enum_fmt_vid_out(struct file *file, void *fh, struct v4l2_fmtdes
                .description = "MPEG",
                .pixelformat = V4L2_PIX_FMT_MPEG,
        };
-       struct ivtv *itv = fh2id(fh)->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv *itv = file2id(file)->itv;
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
 
        if (fmt->index)
                return -EINVAL;
@@ -967,7 +967,7 @@ static int ivtv_enum_fmt_vid_out(struct file *file, void *fh, struct v4l2_fmtdes
 
 static int ivtv_g_input(struct file *file, void *fh, unsigned int *i)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        *i = itv->active_input;
 
@@ -976,7 +976,7 @@ static int ivtv_g_input(struct file *file, void *fh, unsigned int *i)
 
 int ivtv_s_input(struct file *file, void *fh, unsigned int inp)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
        v4l2_std_id std;
        int i;
 
@@ -1019,7 +1019,7 @@ int ivtv_s_input(struct file *file, void *fh, unsigned int inp)
 
 static int ivtv_g_output(struct file *file, void *fh, unsigned int *i)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
                return -EINVAL;
@@ -1031,7 +1031,7 @@ static int ivtv_g_output(struct file *file, void *fh, unsigned int *i)
 
 static int ivtv_s_output(struct file *file, void *fh, unsigned int outp)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        if (outp >= itv->card->nof_outputs)
                return -EINVAL;
@@ -1053,8 +1053,8 @@ static int ivtv_s_output(struct file *file, void *fh, unsigned int outp)
 
 static int ivtv_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv *itv = file2id(file)->itv;
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
 
        if (s->vdev.vfl_dir)
                return -ENOTTY;
@@ -1067,8 +1067,8 @@ static int ivtv_g_frequency(struct file *file, void *fh, struct v4l2_frequency *
 
 int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv *itv = file2id(file)->itv;
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
 
        if (s->vdev.vfl_dir)
                return -ENOTTY;
@@ -1084,7 +1084,7 @@ int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *v
 
 static int ivtv_g_std(struct file *file, void *fh, v4l2_std_id *std)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        *std = itv->std;
        return 0;
@@ -1157,7 +1157,7 @@ void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id std)
 
 static int ivtv_s_std(struct file *file, void *fh, v4l2_std_id std)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        if ((std & V4L2_STD_ALL) == 0)
                return -EINVAL;
@@ -1185,7 +1185,7 @@ static int ivtv_s_std(struct file *file, void *fh, v4l2_std_id std)
 
 static int ivtv_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
 
        if (vt->index != 0)
@@ -1198,7 +1198,7 @@ static int ivtv_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt
 
 static int ivtv_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        if (vt->index != 0)
                return -EINVAL;
@@ -1214,7 +1214,7 @@ static int ivtv_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
 
 static int ivtv_g_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_sliced_vbi_cap *cap)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
        int set = itv->is_50hz ? V4L2_SLICED_VBI_625 : V4L2_SLICED_VBI_525;
        int f, l;
 
@@ -1249,7 +1249,7 @@ static int ivtv_g_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_sliced
 
 static int ivtv_g_enc_index(struct file *file, void *fh, struct v4l2_enc_idx *idx)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
        struct v4l2_enc_idx_entry *e = idx->entry;
        int entries;
        int i;
@@ -1275,7 +1275,7 @@ static int ivtv_g_enc_index(struct file *file, void *fh, struct v4l2_enc_idx *id
 
 static int ivtv_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder_cmd *enc)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
 
 
@@ -1327,7 +1327,7 @@ static int ivtv_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder_cmd
 
 static int ivtv_try_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder_cmd *enc)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        switch (enc->cmd) {
        case V4L2_ENC_CMD_START:
@@ -1357,8 +1357,8 @@ static int ivtv_try_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder
 
 static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv *itv = file2id(file)->itv;
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
        u32 data[CX2341X_MBOX_MAX_DATA];
        struct yuv_playback_info *yi = &itv->yuv_info;
 
@@ -1444,9 +1444,9 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
 
 static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffer *fb)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
        struct yuv_playback_info *yi = &itv->yuv_info;
 
        if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
@@ -1465,9 +1465,9 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffe
 
 static int ivtv_overlay(struct file *file, void *fh, unsigned int on)
 {
-       struct ivtv_open_id *id = fh2id(fh);
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
-       struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
+       struct ivtv_stream *s = &itv->streams[file2id(file)->type];
 
        if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
                return -ENOTTY;
@@ -1492,7 +1492,7 @@ static int ivtv_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subs
 
 static int ivtv_log_status(struct file *file, void *fh)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
        u32 data[CX2341X_MBOX_MAX_DATA];
 
        int has_output = itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT;
@@ -1584,7 +1584,7 @@ static int ivtv_log_status(struct file *file, void *fh)
 
 static int ivtv_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *dec)
 {
-       struct ivtv_open_id *id = fh2id(file_to_v4l2_fh(file));
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
 
        IVTV_DEBUG_IOCTL("VIDIOC_DECODER_CMD %d\n", dec->cmd);
@@ -1593,7 +1593,7 @@ static int ivtv_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd
 
 static int ivtv_try_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *dec)
 {
-       struct ivtv_open_id *id = fh2id(file_to_v4l2_fh(file));
+       struct ivtv_open_id *id = file2id(file);
        struct ivtv *itv = id->itv;
 
        IVTV_DEBUG_IOCTL("VIDIOC_TRY_DECODER_CMD %d\n", dec->cmd);
@@ -1602,7 +1602,7 @@ static int ivtv_try_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder
 
 static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg)
 {
-       struct ivtv_open_id *id = fh2id(file_to_v4l2_fh(filp));
+       struct ivtv_open_id *id = file2id(filp);
        struct ivtv *itv = id->itv;
        struct ivtv_stream *s = &itv->streams[id->type];
 
@@ -1645,7 +1645,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg)
 static long ivtv_default(struct file *file, void *fh, bool valid_prio,
                         unsigned int cmd, void *arg)
 {
-       struct ivtv *itv = fh2id(fh)->itv;
+       struct ivtv *itv = file2id(file)->itv;
 
        if (!valid_prio) {
                switch (cmd) {