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

media: atomisp: Remove unnecessary NULL checks in ia_css_pipe_load_extension

Clang warns:

../drivers/staging/media/atomisp/pci/sh_css.c:8537:14: warning: address
of 'pipe->output_stage' will always evaluate to 'true'
[-Wpointer-bool-conversion]
                if (&pipe->output_stage)
                ~~   ~~~~~~^~~~~~~~~~~~
../drivers/staging/media/atomisp/pci/sh_css.c:8545:14: warning: address
of 'pipe->vf_stage' will always evaluate to 'true'
[-Wpointer-bool-conversion]
                if (&pipe->vf_stage)
                ~~   ~~~~~~^~~~~~~~

output_stage and vf_stage are pointers in the middle of a struct, their
addresses cannot be NULL if pipe is not NULL and pipe is already checked
for NULL in this function. Simplify this if block.

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



Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 55fffcb9

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

+3 −16

Original line number	Diff line number	Diff line
		@@ -8493,22 +8493,9 @@ ia_css_pipe_load_extension(struct ia_css_pipe *pipe,
		}

		if (firmware->info.isp.type == IA_CSS_ACC_OUTPUT)
		{
		if (&pipe->output_stage)
		append_firmware(&pipe->output_stage, firmware);
		else {
		IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_INTERNAL_ERROR);
		return IA_CSS_ERR_INTERNAL_ERROR;
		}
		} else if (firmware->info.isp.type == IA_CSS_ACC_VIEWFINDER)
		{
		if (&pipe->vf_stage)
		else if (firmware->info.isp.type == IA_CSS_ACC_VIEWFINDER)
		append_firmware(&pipe->vf_stage, firmware);
		else {
		IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_INTERNAL_ERROR);
		return IA_CSS_ERR_INTERNAL_ERROR;
		}
		}
		err = acc_load_extension(firmware);

		IA_CSS_LEAVE_ERR_PRIVATE(err);