diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-06-12 15:58:38 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-08-10 07:58:32 +0200 |
| commit | 948a77aaecf202f722cf2264025f9987e5bd5c26 (patch) | |
| tree | 66f504321215e134c8f75322cbf3a9596ab810cc /include | |
| parent | da53c36ddd3f118a525a04faa8c47ca471e6c467 (diff) | |
| download | linux-948a77aaecf202f722cf2264025f9987e5bd5c26.tar.gz linux-948a77aaecf202f722cf2264025f9987e5bd5c26.tar.bz2 linux-948a77aaecf202f722cf2264025f9987e5bd5c26.zip | |
media: cec: core: add adap_unconfigured() callback
The adap_configured() callback was called with the adap->lock mutex
held if the 'configured' argument was false, and without the adap->lock
mutex held if that argument was true.
That was very confusing, and so split this up in a adap_unconfigured()
callback and a high-level configured() callback.
This also makes it easier to understand when the mutex is held: all
low-level adap_* callbacks are called with the mutex held. All other
callbacks are called without that mutex held.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Fixes: f1b57164305d ("media: cec: add optional adap_configured callback")
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/cec.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/cec.h b/include/media/cec.h index 6556cc161dc0..9c007f83569a 100644 --- a/include/media/cec.h +++ b/include/media/cec.h @@ -113,12 +113,12 @@ struct cec_fh { #define CEC_FREE_TIME_TO_USEC(ft) ((ft) * 2400) struct cec_adap_ops { - /* Low-level callbacks */ + /* Low-level callbacks, called with adap->lock held */ 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_configured)(struct cec_adapter *adap, bool configured); + void (*adap_unconfigured)(struct cec_adapter *adap); 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,6 +131,7 @@ 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); }; |