Commit c5449bab authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Remove atomisp_get_metadata_type() 

atomisp_get_metadata_type() always returns ATOMISP_MAIN_METADATA,
replace its uses with ATOMISP_MAIN_METADATA and remove it.

Link: https://lore.kernel.org/r/20230221145906.8113-7-hdegoede@redhat.com



Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 3adf1910

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

+1 −8
Original line number Diff line number Diff line
@@ -728,13 +728,6 @@ static void atomisp_recover_params_queue(struct atomisp_video_pipe *pipe) 
	atomisp_handle_parameter_and_buffer(pipe);

}



enum atomisp_metadata_type

atomisp_get_metadata_type(struct atomisp_sub_device *asd,

			  enum ia_css_pipe_id pipe_id)

{

	return ATOMISP_MAIN_METADATA;

}



void atomisp_buf_done(struct atomisp_sub_device *asd, int error,

		      enum ia_css_buffer_type buf_type,

		      enum ia_css_pipe_id css_pipe_id,
@@ -806,7 +799,7 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error, 
		if (error)

			break;



		md_type = atomisp_get_metadata_type(asd, css_pipe_id);

		md_type = ATOMISP_MAIN_METADATA;

		list_for_each_entry_safe(md_iter, _md_buf_tmp,

					 &asd->metadata_in_css[md_type], list) {

			if (md_iter->metadata ==

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

+0 −5
Original line number Diff line number Diff line
@@ -313,11 +313,6 @@ void atomisp_init_raw_buffer_bitmap(struct atomisp_sub_device *asd); 
int atomisp_enable_dz_capt_pipe(struct atomisp_sub_device *asd,

				unsigned int *enable);



/* Function to get metadata type bu pipe id */

enum atomisp_metadata_type

atomisp_get_metadata_type(struct atomisp_sub_device *asd,

			  enum ia_css_pipe_id pipe_id);



u32 atomisp_get_pixel_depth(u32 pixelformat);



/* Function for HAL to inject a fake event to wake up poll thread */

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

+1 −2
Original line number Diff line number Diff line
@@ -112,8 +112,7 @@ static int atomisp_q_one_metadata_buffer(struct atomisp_sub_device *asd, 
	enum ia_css_pipe_id css_pipe_id)

{

	struct atomisp_metadata_buf *metadata_buf;

	enum atomisp_metadata_type md_type =

	    atomisp_get_metadata_type(asd, css_pipe_id);

	enum atomisp_metadata_type md_type = ATOMISP_MAIN_METADATA;

	struct list_head *metadata_list;



	if (asd->metadata_bufs_in_css[stream_id][css_pipe_id] >=