media: zoran: Remove zoran_fh structure

The zoran_fh structure is a wrapper around v4l2_fh. Its usage has been
mostly removed by commit 83f89a8bcbc3 ("media: zoran: convert to vb2"),
but the structure stayed by mistake. It is now used in a single
location, assigned from a void pointer and then recast to a void
pointer, without being every accessed. Drop it.

Fixes: 83f89a8bcbc3 ("media: zoran: convert to vb2")
Signed-off-by: Jacopo Mondi <jacopo.mondi@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/zoran/zoran.h b/drivers/media/pci/zoran/zoran.h
index 1cd990468d3de9db8b14b72483972041c57bfee2..d05e222b392156bf1b3b4c83c6591db642c3c377 100644 (file)
--- a/drivers/media/pci/zoran/zoran.h
+++ b/drivers/media/pci/zoran/zoran.h
@@ -154,12 +154,6 @@ struct zoran_jpg_settings {
 
 struct zoran;
 
-/* zoran_fh contains per-open() settings */
-struct zoran_fh {
-       struct v4l2_fh fh;
-       struct zoran *zr;
-};
-
 struct card_info {
        enum card_type type;
        char name[32];

diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index f42f596d3e6295e31e3b33cd83c5f7243911bd30..ec7fc1da4cc02f5a344cb49bb9a783c41c758195 100644 (file)
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -511,12 +511,11 @@ static int zoran_s_fmt_vid_cap(struct file *file, void *__fh,
                               struct v4l2_format *fmt)
 {
        struct zoran *zr = video_drvdata(file);
-       struct zoran_fh *fh = __fh;
        int i;
        int res = 0;
 
        if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG)
-               return zoran_s_fmt_vid_out(file, fh, fmt);
+               return zoran_s_fmt_vid_out(file, __fh, fmt);
 
        for (i = 0; i < NUM_FORMATS; i++)
                if (fmt->fmt.pix.pixelformat == zoran_formats[i].fourcc)