diff options
| author | Corentin Labbe <clabbe@baylibre.com> | 2020-09-25 20:30:31 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-10-01 09:40:25 +0200 |
| commit | 000ffb5ec6dc750945debe63531cdefb2b0af12e (patch) | |
| tree | c48389fd05964a798b3a5b64fee26e901cb5b381 | |
| parent | cd669be210b80582609d4d9bf628b20b376f8096 (diff) | |
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 <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/staging/media/zoran/zoran_driver.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c index 518ba19e1e0a..db85978a2893 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; |