media: zoran: Change zoran_v4l_set_format parameter from zoran_fh to zoran (000ffb5e) · Commits · 戴 / test

We need to get rid of zoran_fh, so let's change function arguments. Signed-off-by:

drivers/staging/media/zoran/zoran_driver.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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;