Commit 5d986a0e authored by Kaixu Xia's avatar Kaixu Xia Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: make atomisp_css_continuous_set_num_raw_frames() void 

The return value of atomisp_css_continuous_set_num_raw_frames() function
is always 0, so there's no reason for a return value. In addition, the
__enable_continuous_mode() checked the return value for possible error
which is unnecessary. Convert atomisp_css_continuous_set_num_raw_frames()
to a void function.

Link: https://lore.kernel.org/linux-media/1605362150-11401-1-git-send-email-kaixuxia@tencent.com


Reported-by: default avatarTosk Robot <tencent_os_robot@tencent.com>
Signed-off-by: default avatarKaixu Xia <kaixuxia@tencent.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 19073450

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

+2 −5
Original line number Diff line number Diff line
@@ -5083,11 +5083,8 @@ static int __enable_continuous_mode(struct atomisp_sub_device *asd, 
	atomisp_css_enable_continuous(asd, enable);

	atomisp_css_enable_cvf(asd, asd->continuous_viewfinder->val);



	if (atomisp_css_continuous_set_num_raw_frames(asd,

		asd->continuous_raw_buffer_size->val)) {

		dev_err(isp->dev, "css_continuous_set_num_raw_frames failed\n");

		return -EINVAL;

	}

	atomisp_css_continuous_set_num_raw_frames(asd,

		asd->continuous_raw_buffer_size->val);



	if (!enable) {

		atomisp_css_enable_raw_binning(asd, false);

drivers/staging/media/atomisp/pci/atomisp_compat.h

+3 −3
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ void atomisp_destroy_pipes_stream_force(struct atomisp_sub_device *asd); 
void atomisp_css_stop(struct atomisp_sub_device *asd,

		      enum ia_css_pipe_id pipe_id, bool in_reset);



int atomisp_css_continuous_set_num_raw_frames(

void atomisp_css_continuous_set_num_raw_frames(

     struct atomisp_sub_device *asd,

     int num_frames);

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

+3 −4
Original line number Diff line number Diff line
@@ -2190,7 +2190,7 @@ void atomisp_css_stop(struct atomisp_sub_device *asd, 
	memset(&asd->params.css_param, 0, sizeof(asd->params.css_param));

}



int atomisp_css_continuous_set_num_raw_frames(

void atomisp_css_continuous_set_num_raw_frames(

     struct atomisp_sub_device *asd,

     int num_frames)

{
@@ -2216,7 +2216,6 @@ int atomisp_css_continuous_set_num_raw_frames( 


	asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL]

	.stream_config.target_num_cont_raw_buf = num_frames;

	return 0;

}



static enum ia_css_pipe_mode __pipe_id_to_pipe_mode(