| Message ID | 20200928132831.1587872-3-hverkuil-cisco@xs4all.nl |
|---|---|
| State | Accepted |
| Commit | 05b837920f4959771da7374e6181fd093baafff8 |
| Headers | show |
| Series | zoran: sparse/smatch fixes | expand |
On Mon, Sep 28, 2020 at 03:28:31PM +0200, Hans Verkuil wrote: > 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> > --- Hello What about using "ifdef CONFIG_ZORAN_OUTPUT" instead of "ifdef 0" Otherwise: Acked-by: Corentin Labbe <clabbe@baylibre.com> Regards
Em Fri, 2 Oct 2020 09:29:09 +0200 LABBE Corentin <clabbe@baylibre.com> escreveu: > On Mon, Sep 28, 2020 at 03:28:31PM +0200, Hans Verkuil wrote: > > 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> > > --- > > Hello > > What about using "ifdef CONFIG_ZORAN_OUTPUT" instead of "ifdef 0" > Otherwise: > Acked-by: Corentin Labbe <clabbe@baylibre.com> No. Better to keep #ifdef 0, a this has a higher chance of being noticed when the driver moves out of staging. Thanks, Mauro
diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c index c5b2ccb00ca9..9ea8ec3ef289 100644 --- a/drivers/staging/media/zoran/zoran_driver.c +++ b/drivers/staging/media/zoran/zoran_driver.c @@ -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) {
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> --- drivers/staging/media/zoran/zoran_driver.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)