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

Commit 88ce1465 authored by Tushar Behera's avatar Tushar Behera Committed by Mark Brown
Browse files

ASoC: samsung: Use params_width() 



commit 8c5178fc ("ALSA: Add params_width() helpers") introduces
a helper to get the sample width. Updating Samsung related sound
drivers to use this helper.

Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a6aba536

sound/soc/samsung/i2s.c

+4 −4
Original line number Diff line number Diff line
@@ -676,8 +676,8 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 
	if (is_manager(i2s))

		mod &= ~MOD_BLC_MASK;



	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S8:

	switch (params_width(params)) {

	case 8:

		if (is_secondary(i2s))

			mod |= MOD_BLCS_8BIT;

		else
@@ -685,7 +685,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 
		if (is_manager(i2s))

			mod |= MOD_BLC_8BIT;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

	case 16:

		if (is_secondary(i2s))

			mod |= MOD_BLCS_16BIT;

		else
@@ -693,7 +693,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 
		if (is_manager(i2s))

			mod |= MOD_BLC_16BIT;

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

	case 24:

		if (is_secondary(i2s))

			mod |= MOD_BLCS_24BIT;

		else

sound/soc/samsung/pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ static int s3c_pcm_hw_params(struct snd_pcm_substream *substream, 
	dev_dbg(pcm->dev, "Entered %s\n", __func__);



	/* Strictly check for sample size */

	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S16_LE:

	switch (params_width(params)) {

	case 16:

		break;

	default:

		return -EINVAL;

sound/soc/samsung/s3c-i2s-v2.c

+4 −4
Original line number Diff line number Diff line
@@ -322,13 +322,13 @@ static int s3c_i2sv2_hw_params(struct snd_pcm_substream *substream, 


	iismod &= ~S3C64XX_IISMOD_BLC_MASK;

	/* Sample size */

	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S8:

	switch (params_width(params)) {

	case 8:

		iismod |= S3C64XX_IISMOD_BLC_8BIT;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

	case 16:

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

	case 24:

		iismod |= S3C64XX_IISMOD_BLC_24BIT;

		break;

	}

sound/soc/samsung/s3c2412-i2s.c

+3 −3
Original line number Diff line number Diff line
@@ -120,11 +120,11 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream, 
	iismod = readl(i2s->regs + S3C2412_IISMOD);

	pr_debug("%s: r: IISMOD: %x\n", __func__, iismod);



	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S8:

	switch (params_width(params)) {

	case 8:

		iismod |= S3C2412_IISMOD_8BIT;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

	case 16:

		iismod &= ~S3C2412_IISMOD_8BIT;

		break;

	}

sound/soc/samsung/s3c24xx-i2s.c

+3 −3
Original line number Diff line number Diff line
@@ -248,12 +248,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream, 
	iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);

	pr_debug("hw_params r: IISMOD: %x\n", iismod);



	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S8:

	switch (params_width(params)) {

	case 8:

		iismod &= ~S3C2410_IISMOD_16BIT;

		dma_data->dma_size = 1;

		break;

	case SNDRV_PCM_FORMAT_S16_LE:

	case 16:

		iismod |= S3C2410_IISMOD_16BIT;

		dma_data->dma_size = 2;

		break;