Commit 05b83792 authored Sep 28, 2020 by Hans Verkuil Committed by Mauro Carvalho Chehab Oct 01, 2020

media: zoran: fix sparse warnings



The output is not fully supported yet, so some ops are
commented out. Also comment out the corresponding callbacks to prevent
these sparse warnings:

drivers/staging/media/zoran/zoran_driver.c:656:12: warning: 'zoran_s_output' defined but not used [-Wunused-function]
  656 | static int zoran_s_output(struct file *file, void *__fh, unsigned int output)
      |            ^~~~~~~~~~~~~~
drivers/staging/media/zoran/zoran_driver.c:649:12: warning: 'zoran_g_output' defined but not used [-Wunused-function]
  649 | static int zoran_g_output(struct file *file, void *__fh, unsigned int *output)
      |            ^~~~~~~~~~~~~~
drivers/staging/media/zoran/zoran_driver.c:635:12: warning: 'zoran_enum_output' defined but not used [-Wunused-function]
  635 | static int zoran_enum_output(struct file *file, void *__fh,
      |            ^~~~~~~~~~~~~~~~~
drivers/staging/media/zoran/zoran_driver.c:302:12: warning: 'zoran_enum_fmt_vid_overlay' defined but not used [-Wunused-function]
  302 | static int zoran_enum_fmt_vid_overlay(struct file *file, void *__fh,
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/zoran/zoran_driver.c:294:12: warning: 'zoran_enum_fmt_vid_out' defined but not used [-Wunused-function]
  294 | static int zoran_enum_fmt_vid_out(struct file *file, void *__fh,
      |            ^~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 72c51be8

drivers/staging/media/zoran/zoran_driver.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -291,6 +291,8 @@ static int zoran_enum_fmt_vid_cap(struct file file, void __fh,
		return zoran_enum_fmt(zr, f, ZORAN_FORMAT_CAPTURE);
		}

		#if 0
		/* TODO: output does not work yet */
		static int zoran_enum_fmt_vid_out(struct file file, void __fh,
		struct v4l2_fmtdesc *f)
		{
		@@ -298,14 +300,7 @@ static int zoran_enum_fmt_vid_out(struct file file, void __fh,

		return zoran_enum_fmt(zr, f, ZORAN_FORMAT_PLAYBACK);
		}

		static int zoran_enum_fmt_vid_overlay(struct file file, void __fh,
		struct v4l2_fmtdesc *f)
		{
		struct zoran *zr = video_drvdata(file);

		return zoran_enum_fmt(zr, f, ZORAN_FORMAT_OVERLAY);
		}
		#endif

		static int zoran_g_fmt_vid_out(struct file file, void __fh,
		struct v4l2_format *fmt)
		@@ -632,6 +627,8 @@ static int zoran_s_input(struct file file, void __fh, unsigned int input)
		return res;
		}

		#if 0
		/* TODO: output does not work yet */
		static int zoran_enum_output(struct file file, void __fh,
		struct v4l2_output *outp)
		{
		@@ -660,6 +657,8 @@ static int zoran_s_output(struct file file, void __fh, unsigned int output)

		return 0;
		}
		#endif

		/* cropping (sub-frame capture) */
		static int zoran_g_selection(struct file file, void __fh, struct v4l2_selection *sel)
		{

Admin message