Skip to contentSkip to conversation

ASoC: pcm1681: Convert to params_width()

PATCH In review Mark Brown 2 participants 3 messages Jan 24, 2014 – Jan 25, 2014

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

PATCH 1/2 ASoC: pcm1681: Convert to params_width()

From: Mark Brown <[email protected]>

This will help support future enhancements in the way we negotiate parameters in the core.

---
 sound/soc/codecs/pcm1681.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/codecs/pcm1681.c +10 -5
index 73f9c3630e2c..e427544183d7 100644
@@ -172,16 +172,21 @@ static int pcm1681_hw_params(struct snd_pcm_substream *substream,
 	struct snd_soc_codec *codec = dai->codec;
 	struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec);
 	int val = 0, ret;
-	int pcm_format = params_format(params);
 
 	priv->rate = params_rate(params);
 
 	switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) {
 	case SND_SOC_DAIFMT_RIGHT_J:
-		if (pcm_format == SNDRV_PCM_FORMAT_S24_LE)
-			val = 0x00;
-		else if (pcm_format == SNDRV_PCM_FORMAT_S16_LE)
-			val = 0x03;
+		switch (params_width(params)) {
+		case 24:
+			val = 0;
+			break;
+		case 16:
+			val = 3;
+			break;
+		default:
+			return -EINVAL;
+		}
 		break;
 	case SND_SOC_DAIFMT_I2S:
 		val = 0x04;
Signature · 1 line
1.8.5.3
author maintainer
#1 lore raw

PATCH 2/2 ASoC: pcm1792a: Convert to params_width()

From: Mark Brown <[email protected]>

This will help support future enhancements in the way we negotiate parameters in the core.

---
 sound/soc/codecs/pcm1792a.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)
sound/soc/codecs/pcm1792a.c +22 -11
index 7146653a8e16..3a80ba4452df 100644
@@ -107,24 +107,35 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
 	struct snd_soc_codec *codec = dai->codec;
 	struct pcm1792a_private *priv = snd_soc_codec_get_drvdata(codec);
 	int val = 0, ret;
-	int pcm_format = params_format(params);
 
 	priv->rate = params_rate(params);
 
 	switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) {
 	case SND_SOC_DAIFMT_RIGHT_J:
-		if (pcm_format == SNDRV_PCM_FORMAT_S24_LE ||
-		    pcm_format == SNDRV_PCM_FORMAT_S32_LE)
-			val = 0x02;
-		else if (pcm_format == SNDRV_PCM_FORMAT_S16_LE)
-			val = 0x00;
+		switch (params_width(params)) {
+		case 24:
+		case 32:
+			val = 2;
+			break;
+		case 16:
+			val = 0;
+			break;
+		default:
+			return -EINVAL;
+		}
 		break;
 	case SND_SOC_DAIFMT_I2S:
-		if (pcm_format == SNDRV_PCM_FORMAT_S24_LE ||
-		    pcm_format == SNDRV_PCM_FORMAT_S32_LE)
-			val = 0x05;
-		else if (pcm_format == SNDRV_PCM_FORMAT_S16_LE)
-			val = 0x04;
+		switch (params_width(params)) {
+		case 24:
+		case 32:
+			val = 5;
+			break;
+		case 16:
+			val = 4;
+			break;
+		default:
+			return -EINVAL;
+		}
 		break;
 	default:
 		dev_err(codec->dev, "Invalid DAI format\n");
Signature · 1 line
1.8.5.3
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] ASoC: pcm1792a: Convert to params_width()

Hi

Quoted 62 lines · Mark Brown

From: Mark Brown <[email protected]>

This will help support future enhancements in the way we negotiate parameters in the core.

---
 sound/soc/codecs/pcm1792a.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)
sound/soc/codecs/pcm1792a.c +22 -12
index 7146653a8e16..3a80ba4452df 100644
@@ -107,24 +107,35 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
        struct snd_soc_codec *codec = dai->codec;
        struct pcm1792a_private *priv = snd_soc_codec_get_drvdata(codec);
        int val = 0, ret;
-       int pcm_format = params_format(params);
 
        priv->rate = params_rate(params);
 
        switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_RIGHT_J:
-               if (pcm_format == SNDRV_PCM_FORMAT_S24_LE ||
-                   pcm_format == SNDRV_PCM_FORMAT_S32_LE)
-                       val = 0x02;
-               else if (pcm_format == SNDRV_PCM_FORMAT_S16_LE)
-                       val = 0x00;
+               switch (params_width(params)) {
+               case 24:
+               case 32:
+                       val = 2;
+                       break;
+               case 16:
+                       val = 0;
+                       break;
+               default:
+                       return -EINVAL;
+               }
                break;
        case SND_SOC_DAIFMT_I2S:
-               if (pcm_format == SNDRV_PCM_FORMAT_S24_LE ||
-                   pcm_format == SNDRV_PCM_FORMAT_S32_LE)
-                       val = 0x05;
-               else if (pcm_format == SNDRV_PCM_FORMAT_S16_LE)
-                       val = 0x04;
+               switch (params_width(params)) {
+               case 24:
+               case 32:
+                       val = 5;
+                       break;
+               case 16:
+                       val = 4;
+                       break;
+               default:
+                       return -EINVAL;
+               }
                break;
        default:
                dev_err(codec->dev, "Invalid DAI format\n");
--
Quoted 2 lines

1.8.5.3

Feel free to add my:

Michael