ASoC: jack: Push locking for jacks down to the jack
Currently operations on jack reporting take the CODEC mutex both to protect the current jack status and also to protect the DAPM run which is triggered on status updates. Since the addition of a DAPM-specific lock we no longer need to worry about locking DAPM as it has its own finer grained lock so create a per jack lock to take care of the jack status. This is both cleaner where the jack isn't specifically associated with a CODEC and clearer as it's much more obvious what the lock is protecting. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
ecd1732f01
commit
2667b4b8be
|
@ -518,6 +518,7 @@ struct snd_soc_jack_gpio {
|
|||
#endif
|
||||
|
||||
struct snd_soc_jack {
|
||||
struct mutex mutex;
|
||||
struct snd_jack *jack;
|
||||
struct snd_soc_codec *codec;
|
||||
struct list_head pins;
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
|
||||
struct snd_soc_jack *jack)
|
||||
{
|
||||
mutex_init(&jack->mutex);
|
||||
jack->codec = codec;
|
||||
INIT_LIST_HEAD(&jack->pins);
|
||||
INIT_LIST_HEAD(&jack->jack_zones);
|
||||
|
@ -75,7 +76,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
|
|||
codec = jack->codec;
|
||||
dapm = &codec->dapm;
|
||||
|
||||
mutex_lock(&codec->mutex);
|
||||
mutex_lock(&jack->mutex);
|
||||
|
||||
oldstatus = jack->status;
|
||||
|
||||
|
@ -109,7 +110,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
|
|||
snd_jack_report(jack->jack, jack->status);
|
||||
|
||||
out:
|
||||
mutex_unlock(&codec->mutex);
|
||||
mutex_unlock(&jack->mutex);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_jack_report);
|
||||
|
||||
|
|
Loading…
Reference in a new issue