Commit bcc3ba66 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of phys event abstractions 



ia_css_dequeue_event() is just an alias to ia_css_dequeue_psys_event(),
and atomisp_css_dequeue_event() do nothing but calling the event
dequeue logic.

Get rid of both abstractions, calling the function directly.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 58043dbf

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

+1 −1
Original line number Diff line number Diff line
@@ -1881,7 +1881,7 @@ irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr) 
	/*

	 * The standard CSS2.0 API tells the following calling sequence of

	 * dequeue ready buffers:

	 * while (ia_css_dequeue_event(...)) {

	 * while (ia_css_dequeue_psys_event(...)) {

	 *	switch (event.type) {

	 *	...

	 *	ia_css_pipe_dequeue_buffer()

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

+0 −2
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ void atomisp_css_get_dis_statistics(struct atomisp_sub_device *asd, 
				    struct atomisp_css_buffer *isp_css_buffer,

				    struct ia_css_isp_dvs_statistics_map *dvs_map);



int atomisp_css_dequeue_event(struct atomisp_css_event *current_event);



void atomisp_css_temp_pipe_to_pipe_id(struct atomisp_sub_device *asd,

				      struct atomisp_css_event *current_event);

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

+1 −9
Original line number Diff line number Diff line
@@ -1633,14 +1633,6 @@ void atomisp_css_get_dis_statistics(struct atomisp_sub_device *asd, 
	}

}



int atomisp_css_dequeue_event(struct atomisp_css_event *current_event)

{

	if (ia_css_dequeue_event(&current_event->event))

		return -EINVAL;



	return 0;

}



void atomisp_css_temp_pipe_to_pipe_id(struct atomisp_sub_device *asd,

				      struct atomisp_css_event *current_event)

{
@@ -4120,7 +4112,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp, 
	bool reset_wdt_timer[MAX_STREAM_NUM] = {false};

	int i;



	while (!atomisp_css_dequeue_event(&current_event)) {

	while (!ia_css_dequeue_psys_event(&current_event.event)) {

		if (current_event.event.type ==

		    IA_CSS_EVENT_TYPE_FW_ASSERT) {

			/*

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

+1 −16
Original line number Diff line number Diff line
@@ -157,21 +157,6 @@ struct ia_css_event { 
int

ia_css_dequeue_psys_event(struct ia_css_event *event);



/* @brief Dequeue an event from the CSS system.

 *

 * @param[out]	event   Pointer to the event struct which will be filled by

 *                      this function if an event is available.

 * @return		-ENODATA if no events are

 *			available or

 *			0 otherwise.

 *

 * deprecated{Use ia_css_dequeue_psys_event instead}.

 * Unless the isys event queue is explicitly enabled, this function will

 * dequeue both isys (EOF) and psys events (all others).

 */

int

ia_css_dequeue_event(struct ia_css_event *event);



/* @brief Dequeue an ISYS event from the CSS system.

 *

 * @param[out]	event   Pointer to the event struct which will be filled by
@@ -182,7 +167,7 @@ ia_css_dequeue_event(struct ia_css_event *event); 
 *

 * This function dequeues an event from the ISYS event queue. The queue is

 * between host and the CSS system.

 * Unlike the ia_css_dequeue_event() function, this function can be called

 * Unlike the ia_css_dequeue_psys_event() function, this function can be called

 * directly from an interrupt service routine (ISR) and it is safe to call

 * this function in parallel with other CSS API functions (but only one

 * call to this function should be in flight at any point in time).

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

+0 −6
Original line number Diff line number Diff line
@@ -4423,12 +4423,6 @@ static enum ia_css_event_type convert_event_sp_to_host_domain[] = { 
	0,					/* error if sp passes  SH_CSS_SP_EVENT_NR_OF_TYPES as a valid event. */

};



int

ia_css_dequeue_event(struct ia_css_event *event)

{

	return ia_css_dequeue_psys_event(event);

}



int

ia_css_dequeue_psys_event(struct ia_css_event *event)

{