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

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
...@@ -1881,7 +1881,7 @@ irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr) ...@@ -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 * The standard CSS2.0 API tells the following calling sequence of
* dequeue ready buffers: * dequeue ready buffers:
* while (ia_css_dequeue_event(...)) { * while (ia_css_dequeue_psys_event(...)) {
* switch (event.type) { * switch (event.type) {
* ... * ...
* ia_css_pipe_dequeue_buffer() * ia_css_pipe_dequeue_buffer()
......
...@@ -133,8 +133,6 @@ void atomisp_css_get_dis_statistics(struct atomisp_sub_device *asd, ...@@ -133,8 +133,6 @@ void atomisp_css_get_dis_statistics(struct atomisp_sub_device *asd,
struct atomisp_css_buffer *isp_css_buffer, struct atomisp_css_buffer *isp_css_buffer,
struct ia_css_isp_dvs_statistics_map *dvs_map); 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, void atomisp_css_temp_pipe_to_pipe_id(struct atomisp_sub_device *asd,
struct atomisp_css_event *current_event); struct atomisp_css_event *current_event);
......
...@@ -1633,14 +1633,6 @@ void atomisp_css_get_dis_statistics(struct atomisp_sub_device *asd, ...@@ -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, void atomisp_css_temp_pipe_to_pipe_id(struct atomisp_sub_device *asd,
struct atomisp_css_event *current_event) struct atomisp_css_event *current_event)
{ {
...@@ -4120,7 +4112,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp, ...@@ -4120,7 +4112,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp,
bool reset_wdt_timer[MAX_STREAM_NUM] = {false}; bool reset_wdt_timer[MAX_STREAM_NUM] = {false};
int i; int i;
while (!atomisp_css_dequeue_event(&current_event)) { while (!ia_css_dequeue_psys_event(&current_event.event)) {
if (current_event.event.type == if (current_event.event.type ==
IA_CSS_EVENT_TYPE_FW_ASSERT) { IA_CSS_EVENT_TYPE_FW_ASSERT) {
/* /*
......
...@@ -157,21 +157,6 @@ struct ia_css_event { ...@@ -157,21 +157,6 @@ struct ia_css_event {
int int
ia_css_dequeue_psys_event(struct ia_css_event *event); 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. /* @brief Dequeue an ISYS event from the CSS system.
* *
* @param[out] event Pointer to the event struct which will be filled by * @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); ...@@ -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 * This function dequeues an event from the ISYS event queue. The queue is
* between host and the CSS system. * 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 * 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 * 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). * call to this function should be in flight at any point in time).
......
...@@ -4423,12 +4423,6 @@ static enum ia_css_event_type convert_event_sp_to_host_domain[] = { ...@@ -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. */ 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 int
ia_css_dequeue_psys_event(struct ia_css_event *event) ia_css_dequeue_psys_event(struct ia_css_event *event)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment