Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edd71350 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Move compr_attach/attached functions 



Move wm_adsp_compr_attach and wm_adsp_compr_attached functions so they
will stay logically grouped with similar functions after some additional
changes.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0023f8a6

sound/soc/codecs/wm_adsp.c

+19 −19
Original line number Diff line number Diff line
@@ -2452,6 +2452,25 @@ void wm_adsp2_remove(struct wm_adsp *dsp) 
}

EXPORT_SYMBOL_GPL(wm_adsp2_remove);



static inline int wm_adsp_compr_attached(struct wm_adsp_compr *compr)

{

	return compr->buf != NULL;

}



static int wm_adsp_compr_attach(struct wm_adsp_compr *compr)

{

	/*

	 * Note this will be more complex once each DSP can support multiple

	 * streams

	 */

	if (!compr->dsp->buffer)

		return -EINVAL;



	compr->buf = compr->dsp->buffer;



	return 0;

}



int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream)

{

	struct wm_adsp_compr *compr;
@@ -2810,25 +2829,6 @@ static int wm_adsp_buffer_free(struct wm_adsp *dsp) 
	return 0;

}



static inline int wm_adsp_compr_attached(struct wm_adsp_compr *compr)

{

	return compr->buf != NULL;

}



static int wm_adsp_compr_attach(struct wm_adsp_compr *compr)

{

	/*

	 * Note this will be more complex once each DSP can support multiple

	 * streams

	 */

	if (!compr->dsp->buffer)

		return -EINVAL;



	compr->buf = compr->dsp->buffer;



	return 0;

}



int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd)

{

	struct wm_adsp_compr *compr = stream->runtime->private_data;