diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-01-28 20:45:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-01-28 20:45:33 +0000 |
| commit | 4c38f8747c5769a272bc6557c2504d218f01914e (patch) | |
| tree | 56196342cd9ed96e6f152f5d066d0151f111c171 /include | |
| parent | ASoC: rt5682: Fix deadlock on resume (diff) | |
| parent | ASoC: soc-pcm: Move debugfs removal out of spinlock (diff) | |
| download | linux-dev-4c38f8747c5769a272bc6557c2504d218f01914e.tar.xz linux-dev-4c38f8747c5769a272bc6557c2504d218f01914e.zip | |
ASoC DPCM lockdep fixes
Merge series from Takashi Iwai <tiwai@suse.de>:
This is the revised patches for addressing ASoC lockdep warnings due
to the recent DPCM locking refactoring.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/pcm.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 33451f8ff755..524220fe1af6 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -614,6 +614,7 @@ void snd_pcm_stream_unlock(struct snd_pcm_substream *substream); void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream); void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream); unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream); +unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream); /** * snd_pcm_stream_lock_irqsave - Lock the PCM stream @@ -633,6 +634,20 @@ void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream, unsigned long flags); /** + * snd_pcm_stream_lock_irqsave_nested - Single-nested PCM stream locking + * @substream: PCM substream + * @flags: irq flags + * + * This locks the PCM stream like snd_pcm_stream_lock_irqsave() but with + * the single-depth lockdep subclass. + */ +#define snd_pcm_stream_lock_irqsave_nested(substream, flags) \ + do { \ + typecheck(unsigned long, flags); \ + flags = _snd_pcm_stream_lock_irqsave_nested(substream); \ + } while (0) + +/** * snd_pcm_group_for_each_entry - iterate over the linked substreams * @s: the iterator * @substream: the substream |