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

Commit d4f102d4 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: tlv320dac33: Introduce prefill and playback state handlers 



Ensure that the code is going to be readable, when new FIFO modes
are introduced later.
Move the prefill and playback state handling to inlined
functions.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7427b4b9

sound/soc/codecs/tlv320dac33.c

+40 −6
Original line number Original line Diff line number Diff line
@@ -543,6 +543,44 @@ static int dac33_set_bias_level(struct snd_soc_codec *codec, 
	return 0;

	return 0;

}

}





static inline void dac33_prefill_handler(struct tlv320dac33_priv *dac33)

{

	struct snd_soc_codec *codec;



	codec = &dac33->codec;



	switch (dac33->fifo_mode) {

	case DAC33_FIFO_MODE1:

		dac33_write16(codec, DAC33_NSAMPLE_MSB,

				DAC33_THRREG(dac33->nsample));

		dac33_write16(codec, DAC33_PREFILL_MSB,

				DAC33_THRREG(dac33->alarm_threshold));

		break;

	default:

		dev_warn(codec->dev, "Unhandled FIFO mode: %d\n",

							dac33->fifo_mode);

		break;

	}

}



static inline void dac33_playback_handler(struct tlv320dac33_priv *dac33)

{

	struct snd_soc_codec *codec;



	codec = &dac33->codec;



	switch (dac33->fifo_mode) {

	case DAC33_FIFO_MODE1:

		dac33_write16(codec, DAC33_NSAMPLE_MSB,

				DAC33_THRREG(dac33->nsample));

		break;

	default:

		dev_warn(codec->dev, "Unhandled FIFO mode: %d\n",

							dac33->fifo_mode);

		break;

	}

}



static void dac33_work(struct work_struct *work)

static void dac33_work(struct work_struct *work)

{

{

	struct snd_soc_codec *codec;

	struct snd_soc_codec *codec;
@@ -556,14 +594,10 @@ static void dac33_work(struct work_struct *work) 
	switch (dac33->state) {

	switch (dac33->state) {

	case DAC33_PREFILL:

	case DAC33_PREFILL:

		dac33->state = DAC33_PLAYBACK;

		dac33->state = DAC33_PLAYBACK;

		dac33_write16(codec, DAC33_NSAMPLE_MSB,

		dac33_prefill_handler(dac33);

				DAC33_THRREG(dac33->nsample));

		dac33_write16(codec, DAC33_PREFILL_MSB,

				DAC33_THRREG(dac33->alarm_threshold));

		break;

		break;

	case DAC33_PLAYBACK:

	case DAC33_PLAYBACK:

		dac33_write16(codec, DAC33_NSAMPLE_MSB,

		dac33_playback_handler(dac33);

				DAC33_THRREG(dac33->nsample));

		break;

		break;

	case DAC33_IDLE:

	case DAC33_IDLE:

		break;

		break;