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

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

ASoC: wm_adsp: Factor out fetching of stream errors from the DSP 



Factor out the reading of the DSP error flag into its own function to
support further improvements to the code.

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

sound/soc/codecs/wm_adsp.c

+19 −9
Original line number Original line Diff line number Diff line
@@ -2816,6 +2816,23 @@ static int wm_adsp_buffer_update_avail(struct wm_adsp_compr_buf *buf) 
	return 0;

	return 0;

}

}





static int wm_adsp_buffer_get_error(struct wm_adsp_compr_buf *buf)

{

	int ret;



	ret = wm_adsp_buffer_read(buf, HOST_BUFFER_FIELD(error), &buf->error);

	if (ret < 0) {

		adsp_err(buf->dsp, "Failed to check buffer error: %d\n", ret);

		return ret;

	}

	if (buf->error != 0) {

		adsp_err(buf->dsp, "Buffer error occurred: %d\n", buf->error);

		return -EIO;

	}



	return 0;

}



int wm_adsp_compr_handle_irq(struct wm_adsp *dsp)

int wm_adsp_compr_handle_irq(struct wm_adsp *dsp)

{

{

	struct wm_adsp_compr_buf *buf;

	struct wm_adsp_compr_buf *buf;
@@ -2834,16 +2851,9 @@ int wm_adsp_compr_handle_irq(struct wm_adsp *dsp) 




	adsp_dbg(dsp, "Handling buffer IRQ\n");

	adsp_dbg(dsp, "Handling buffer IRQ\n");





	ret = wm_adsp_buffer_read(buf, HOST_BUFFER_FIELD(error), &buf->error);

	ret = wm_adsp_buffer_get_error(buf);

	if (ret < 0) {

	if (ret < 0)

		adsp_err(dsp, "Failed to check buffer error: %d\n", ret);

		goto out;

	}

	if (buf->error != 0) {

		adsp_err(dsp, "Buffer error occurred: %d\n", buf->error);

		ret = -EIO;

		goto out;

		goto out;

	}





	ret = wm_adsp_buffer_read(buf, HOST_BUFFER_FIELD(irq_count),

	ret = wm_adsp_buffer_read(buf, HOST_BUFFER_FIELD(irq_count),

				  &buf->irq_count);

				  &buf->irq_count);