From ecf3d93213c2fa2f453a49d0f11478e891f073d9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 12 Oct 2023 14:06:51 +0000 Subject: [PATCH] Revert "media: cec: core: add adap_nb_transmit_canceled() callback" This reverts commit d6610151ae22954bdec1d154022072b57a9ac487 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 --- drivers/media/cec/core/cec-adap.c | 4 ++-- include/media/cec.h | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c index aed3e51d6d35..b1512f9c5895 100644 --- a/drivers/media/cec/core/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c @@ -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); } diff --git a/include/media/cec.h b/include/media/cec.h index 6556cc161dc0..abee41ae02d0 100644 --- a/include/media/cec.h +++ b/include/media/cec.h @@ -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); };