Commit ebf89d12 authored May 27, 2020 by Nathan Chancellor Committed by Mauro Carvalho Chehab Jun 11, 2020

media: atomisp: Clean up if block in sh_css_sp_init_stage

Clang warns:

../drivers/staging/media/atomisp/pci/sh_css_sp.c:1039:23: warning:
address of 'binary->in_frame_info' will always evaluate to 'true'
[-Wpointer-bool-conversion]
                } else if (&binary->in_frame_info) {
                       ~~   ~~~~~~~~^~~~~~~~~~~~~

in_frame_info is not a pointer so if binary is not NULL, in_frame_info's
address cannot be NULL. Change this to an else since it will always be
evaluated as one.

While we are here, clean up this if block. The contents of both if
blocks are the same but a check against "stage == 0" is added when
ISP2401 is defined. USE_INPUT_SYSTEM_VERSION_2401 is only defined when
isp2401_system_global.h is included, which only happens when ISP2401. In
other words, USE_INPUT_SYSTEM_VERSION_2401 always requires ISP2401 to be
defined so the '#ifndef ISP2401' makes no sense. Remove that part of the
block to simplify everything.

Link: https://github.com/ClangBuiltLinux/linux/issues/1036



Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent bbed5b89

drivers/staging/media/atomisp/pci/sh_css_sp.c

+4 −23

Original line number	Diff line number	Diff line
		@@ -1027,35 +1027,16 @@ sh_css_sp_init_stage(struct ia_css_binary *binary,
		return err;

		#ifdef USE_INPUT_SYSTEM_VERSION_2401
		#ifndef ISP2401
		if (args->in_frame)
		{
		pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num);
		if (!pipe)
		return IA_CSS_ERR_INTERNAL_ERROR;
		ia_css_get_crop_offsets(pipe, &args->in_frame->info);
		} else if (&binary->in_frame_info)
		{
		pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num);
		if (!pipe)
		return IA_CSS_ERR_INTERNAL_ERROR;
		ia_css_get_crop_offsets(pipe, &binary->in_frame_info);
		#else
		if (stage == 0)
		{
		if (args->in_frame) {
		if (stage == 0) {
		pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num);
		if (!pipe)
		return IA_CSS_ERR_INTERNAL_ERROR;

		if (args->in_frame)
		ia_css_get_crop_offsets(pipe, &args->in_frame->info);
		} else if (&binary->in_frame_info) {
		pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num);
		if (!pipe)
		return IA_CSS_ERR_INTERNAL_ERROR;
		else
		ia_css_get_crop_offsets(pipe, &binary->in_frame_info);
		}
		#endif
		}
		#else
		(void)pipe; /avoid build warning/
		#endif