We need to get rid of zoran_fh, so let's change function arguments.

Signed-off-by: Corentin Labbe <cla...@baylibre.com>
---
 drivers/staging/media/zoran/zoran_driver.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/zoran/zoran_driver.c 
b/drivers/staging/media/zoran/zoran_driver.c
index 9d39e98c9af1..078575334b5d 100644
--- a/drivers/staging/media/zoran/zoran_driver.c
+++ b/drivers/staging/media/zoran/zoran_driver.c
@@ -401,11 +401,9 @@ static void jpg_fbuffer_free(struct zoran_fh *fh)
 /*
  *   V4L Buffer grabbing
  */
-
-static int zoran_v4l_set_format(struct zoran_fh *fh, int width, int height,
+static int zoran_v4l_set_format(struct zoran *zr, int width, int height,
                                const struct zoran_format *format)
 {
-       struct zoran *zr = fh->zr;
        int bpp;
 
        /* Check size and format of the grab wanted */
@@ -1665,7 +1663,7 @@ static int zoran_s_fmt_vid_cap(struct file *file, void 
*__fh, struct v4l2_format
 
        map_mode_raw(fh);
 
-       res = zoran_v4l_set_format(fh, fmt->fmt.pix.width, fmt->fmt.pix.height, 
&zoran_formats[i]);
+       res = zoran_v4l_set_format(zr, fmt->fmt.pix.width, fmt->fmt.pix.height, 
&zoran_formats[i]);
        if (res)
                return res;
 
-- 
2.26.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to