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

Commit d3aee799 authored by Russell King's avatar Russell King Committed by Takashi Iwai
Browse files

ALSA: AACI: factor common hw_params logic into aaci_pcm_hw_params 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4e30b691

sound/arm/aaci.c

+7 −15
Original line number Diff line number Diff line
@@ -444,6 +444,11 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, 
					aacirun->pcm->r[0].slots);



		aacirun->pcm_open = err == 0;

		aacirun->cr = CR_FEN | CR_COMPACT | CR_SZ16;

		aacirun->fifosz = aaci->fifosize * 4;



		if (aacirun->cr & CR_COMPACT)

			aacirun->fifosz >>= 1;

	}



	return err;
@@ -554,14 +559,9 @@ static int aaci_pcm_playback_hw_params(struct snd_pcm_substream *substream, 
	 * Enable FIFO, compact mode, 16 bits per sample.

	 * FIXME: double rate slots?

	 */

	if (ret >= 0) {

		aacirun->cr = CR_FEN | CR_COMPACT | CR_SZ16;

	if (ret >= 0)

		aacirun->cr |= channels_to_txmask[channels];



		aacirun->fifosz	= aaci->fifosize * 4;

		if (aacirun->cr & CR_COMPACT)

			aacirun->fifosz >>= 1;

	}

	return ret;

}
@@ -648,18 +648,10 @@ static int aaci_pcm_capture_hw_params(struct snd_pcm_substream *substream, 
	int ret;



	ret = aaci_pcm_hw_params(substream, aacirun, params);



	if (ret >= 0) {

		aacirun->cr = CR_FEN | CR_COMPACT | CR_SZ16;



	if (ret >= 0)

		/* Line in record: slot 3 and 4 */

		aacirun->cr |= CR_SL3 | CR_SL4;



		aacirun->fifosz = aaci->fifosize * 4;



		if (aacirun->cr & CR_COMPACT)

			aacirun->fifosz >>= 1;

	}

	return ret;

}