Commit a655f75c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm_dmaengine: Remove hardcoded PCM formats 



Use the standard PCM helper function to figure out the sample bytes
instead of hardcodec PCM format checks in
snd_hwparams_to_dma_slave_config().

The patch also extends the format check for 8 bytes formats although
no one should match so far.

Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent afb5a779

sound/core/pcm_dmaengine.c

+9 −13
Original line number Diff line number Diff line
@@ -63,23 +63,19 @@ int snd_hwparams_to_dma_slave_config(const struct snd_pcm_substream *substream, 
	struct dma_slave_config *slave_config)

{

	enum dma_slave_buswidth buswidth;

	int bits;



	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S8:

	bits = snd_pcm_format_physical_width(params_format(params));

	if (bits < 8 || bits > 64)

		return -EINVAL;

	else if (bits == 8)

		buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

	else if (bits == 16)

		buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;

		break;

	case SNDRV_PCM_FORMAT_S18_3LE:

	case SNDRV_PCM_FORMAT_S20_3LE:

	case SNDRV_PCM_FORMAT_S24_LE:

	case SNDRV_PCM_FORMAT_S32_LE:

	else if (bits <= 32)

		buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;

		break;

	default:

		return -EINVAL;

	}

	else

		buswidth = DMA_SLAVE_BUSWIDTH_8_BYTES;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		slave_config->direction = DMA_MEM_TO_DEV;

CRA Git | Maintained and supported by SUSTech CRA and CCSE