Unverified Commit 2d3b218d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87msl6aa2c.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8a8dcf70

sound/soc/soc-pcm.c

+2 −8
Original line number Diff line number Diff line
@@ -49,12 +49,6 @@ static inline int _soc_pcm_ret(struct snd_soc_pcm_runtime *rtd, 
	return ret;

}



#define snd_soc_dpcm_stream_lock_irqsave_nested(rtd, stream, flags) \

	snd_pcm_stream_lock_irqsave_nested(snd_soc_dpcm_get_substream(rtd, stream), flags)



#define snd_soc_dpcm_stream_unlock_irqrestore(rtd, stream, flags) \

	snd_pcm_stream_unlock_irqrestore(snd_soc_dpcm_get_substream(rtd, stream), flags)



#define DPCM_MAX_BE_USERS	8



static inline const char *soc_cpu_dai_name(struct snd_soc_pcm_runtime *rtd)
@@ -2144,7 +2138,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, 
		be = dpcm->be;

		be_substream = snd_soc_dpcm_get_substream(be, stream);



		snd_soc_dpcm_stream_lock_irqsave_nested(be, stream, flags);

		snd_pcm_stream_lock_irqsave_nested(be_substream, flags);



		/* is this op for this BE ? */

		if (!snd_soc_dpcm_be_can_update(fe, be, stream))
@@ -2291,7 +2285,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, 
			break;

		}

next:

		snd_soc_dpcm_stream_unlock_irqrestore(be, stream, flags);

		snd_pcm_stream_unlock_irqrestore(be_substream, flags);

		if (ret)

			break;

	}