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_nb_transmit_canceled() callback"

Browse Source 
This reverts commit d6610151ae which is
commit da53c36ddd3f118a525a04faa8c47ca471e6c467 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: I65b4767764af29e74b2e349e7943f4f70f333823
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-10-12 14:06:51 +00:00
parent 045f98748d
commit ecf3d93213
2 changed files with 4 additions and 6 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

@ -385,8 +385,8 @@ static void cec_data_cancel(struct cec_data *data, u8 tx_status, u8 rx_status)
cec_queue_msg_monitor(adap, &data->msg, 1);
if (!data->blocking && data->msg.sequence)
/* Allow drivers to react to a canceled transmit */
call_void_op(adap, adap_nb_transmit_canceled, &data->msg);
/* Allow drivers to process the message first */
call_op(adap, received, &data->msg);
cec_data_completed(data);
}

6
include/media/cec.h
View File

@ -121,16 +121,14 @@ struct cec_adap_ops {
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,
const struct cec_msg *msg);
void (*adap_status)(struct cec_adapter *adap, struct seq_file *file);
void (*adap_free)(struct cec_adapter *adap);
/* Error injection callbacks, called without adap->lock held */
/* Error injection callbacks */
int (*error_inj_show)(struct cec_adapter *adap, struct seq_file *sf);
bool (*error_inj_parse_line)(struct cec_adapter *adap, char *line);
/* High-level CEC message callback, called without adap->lock held */
/* High-level CEC message callback */
int (*received)(struct cec_adapter *adap, struct cec_msg *msg);
};