ASoC: Remove impossible case from wm8994_hw_params

PATCH Superseded Axel Lin 2 participants 2 messages Oct 4, 2011 – Oct 5, 2011

Subsystems (3)

Sound ASoC Wolfson microelectronics drivers

lore

Share & tools

lore

Axel Lin

author

2011-10-04 23:16 UTC #0 lore raw

PATCH 1/1 ASoC: Remove impossible case from wm8994_hw_params

We set hw_params callback for wm8994_aif3_dai_ops to wm8994_aif3_hw_params. Thus no need to check wm8994-aif3 in wm8994_hw_params.

Signed-off-by Axel Lin <[email protected]>

---
 sound/soc/codecs/wm8994.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

sound/soc/codecs/wm8994.c +0 -9

index d5b69c0..94a8db2 100644
@@ -2210,7 +2210,6 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
 			    struct snd_soc_dai *dai)
 {
 	struct snd_soc_codec *codec = dai->codec;
-	struct wm8994 *control = codec->control_data;
 	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 	int aif1_reg;
 	int aif2_reg;

@@ -2253,14 +2252,6 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
 			dev_dbg(codec->dev, "AIF2 using split LRCLK\n");
 		}
 		break;
-	case 3:
-		switch (control->type) {
-		case WM8958:
-			aif1_reg = WM8958_AIF3_CONTROL_1;
-			break;
-		default:
-			return 0;
-		}
 	default:
 		return -EINVAL;
 	}

Signature · 1 line

1.7.4.1

Mark Brown

2011-10-05 16:17 UTC #1 lore raw

Quoted 2 lines · Axel Lin

We set hw_params callback for wm8994_aif3_dai_ops to wm8994_aif3_hw_params. Thus no need to check wm8994-aif3 in wm8994_hw_params.

This patch doesn't apply against current code, please recheck and resend if required.