Commit 948a77aa authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Fixes: f1b57164 ("media: cec: add optional adap_configured callback")
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent da53c36d

drivers/media/cec/core/cec-adap.c

+2 −2
Original line number Diff line number Diff line
@@ -1348,7 +1348,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_configured, false);

	call_void_op(adap, adap_unconfigured);

}



/*
@@ -1539,7 +1539,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, adap_configured, true);

	call_void_op(adap, configured);

	return 0;



unconfigure:

include/media/cec.h

+3 −2
Original line number Diff line number Diff line
@@ -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);

};