android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "media: cec: core: add adap_unconfigured() callback"

Browse Source 
This reverts commit 0294e24750 which is
commit 948a77aaecf202f722cf2264025f9987e5bd5c26 upstream.

It breaks the Android ABI and is not needed for Android systems at this
point in time.  If needed in the future, it can come back in an abi-safe
way.

Bug: 161946584
Change-Id: I622663df8e9ddfd598285f8af7631f0406351fe0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-10-12 14:06:50 +00:00
parent cb6717439c
commit 045f98748d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/cec/core/cec-adap.c
View File

@ -1345,7 +1345,7 @@ static void cec_adap_unconfigure(struct cec_adapter *adap)
cec_flush(adap);
wake_up_interruptible(&adap->kthread_waitq);
cec_post_state_event(adap);
call_void_op(adap, adap_unconfigured);
call_void_op(adap, adap_configured, false);
}
/*
@ -1536,7 +1536,7 @@ static int cec_config_thread_func(void *arg)
adap->kthread_config = NULL;
complete(&adap->config_completion);
mutex_unlock(&adap->lock);
call_void_op(adap, configured);
call_void_op(adap, adap_configured, true);
return 0;
unconfigure:

5
include/media/cec.h
View File

@ -113,12 +113,12 @@ struct cec_fh {
#define CEC_FREE_TIME_TO_USEC(ft) ((ft) * 2400)
struct cec_adap_ops {
/* Low-level callbacks, called with adap->lock held */
/* Low-level callbacks */
int (*adap_enable)(struct cec_adapter *adap, bool enable);
int (*adap_monitor_all_enable)(struct cec_adapter *adap, bool enable);
int (*adap_monitor_pin_enable)(struct cec_adapter *adap, bool enable);
int (*adap_log_addr)(struct cec_adapter *adap, u8 logical_addr);
void (*adap_unconfigured)(struct cec_adapter *adap);
void (*adap_configured)(struct cec_adapter *adap, bool configured);
int (*adap_transmit)(struct cec_adapter *adap, u8 attempts,
u32 signal_free_time, struct cec_msg *msg);
void (*adap_nb_transmit_canceled)(struct cec_adapter *adap,
@ -131,7 +131,6 @@ struct cec_adap_ops {
bool (*error_inj_parse_line)(struct cec_adapter *adap, char *line);
/* High-level CEC message callback, called without adap->lock held */
void (*configured)(struct cec_adapter *adap);
int (*received)(struct cec_adapter *adap, struct cec_msg *msg);
};