diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-02-15 14:49:08 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-02-15 14:49:28 +0100 |
| commit | a9f73b06ff913da374d257d933a1cf9bfbc84743 (patch) | |
| tree | e9fc2f519d9662a5264ab17456fc8991f739a4bd /include/sound | |
| parent | 0707541df449001885d39da8d989f73d1b898fca (diff) | |
| parent | 5948342a526f43ffbd02ebac64670e55475b7e09 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/sound')
| -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 9b187d86e1bd..36da42cd0774 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -617,6 +617,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 @@ -636,6 +637,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 |