From: Corentin Labbe Date: Fri, 25 Sep 2020 18:30:31 +0000 (+0200) Subject: media: zoran: Change zoran_v4l_set_format parameter from zoran_fh to zoran X-Git-Tag: v5.10-rc1~175^2~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=000ffb5ec6dc750945debe63531cdefb2b0af12e;p=thirdparty%2Fkernel%2Flinux.git media: zoran: Change zoran_v4l_set_format parameter from zoran_fh to zoran We need to get rid of zoran_fh, so let's change function arguments. Signed-off-by: Corentin Labbe Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c index 518ba19e1e0ad..db85978a28934 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 */ @@ -1671,7 +1669,7 @@ static int zoran_s_fmt_vid_cap(struct file *file, void *__fh, map_mode_raw(fh); - res = zoran_v4l_set_format(fh, fmt->fmt.pix.width, fmt->fmt.pix.height, + res = zoran_v4l_set_format(zr, fmt->fmt.pix.width, fmt->fmt.pix.height, &zoran_formats[i]); if (res) return res;