tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: soc-pcm: remove snd_soc_dpcm_stream_lock_irqsave_nested()

soc-pcm.c has snd_soc_dpcm_stream_lock_irqsave_nested() /
snd_soc_dpcm_stream_unlock_irqrestore() helper function,
but it is almost nothing help. It just makes a code complex.
Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87msl6aa2c.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown 2d3b218d 8a8dcf70

+2 -8
+2 -8
sound/soc/soc-pcm.c
··· 49 49 return ret; 50 50 } 51 51 52 - #define snd_soc_dpcm_stream_lock_irqsave_nested(rtd, stream, flags) \ 53 - snd_pcm_stream_lock_irqsave_nested(snd_soc_dpcm_get_substream(rtd, stream), flags) 54 - 55 - #define snd_soc_dpcm_stream_unlock_irqrestore(rtd, stream, flags) \ 56 - snd_pcm_stream_unlock_irqrestore(snd_soc_dpcm_get_substream(rtd, stream), flags) 57 - 58 52 #define DPCM_MAX_BE_USERS 8 59 53 60 54 static inline const char *soc_cpu_dai_name(struct snd_soc_pcm_runtime *rtd) ··· 2138 2144 be = dpcm->be; 2139 2145 be_substream = snd_soc_dpcm_get_substream(be, stream); 2140 2146 2141 - snd_soc_dpcm_stream_lock_irqsave_nested(be, stream, flags); 2147 + snd_pcm_stream_lock_irqsave_nested(be_substream, flags); 2142 2148 2143 2149 /* is this op for this BE ? */ 2144 2150 if (!snd_soc_dpcm_be_can_update(fe, be, stream)) ··· 2285 2291 break; 2286 2292 } 2287 2293 next: 2288 - snd_soc_dpcm_stream_unlock_irqrestore(be, stream, flags); 2294 + snd_pcm_stream_unlock_irqrestore(be_substream, flags); 2289 2295 if (ret) 2290 2296 break; 2291 2297 }