[Resend PATCH] ASoC: wm8904: remove redundant code

[Resend PATCH] ASoC: wm8904: remove redundant code

[Bo Shen]

The core_intercon register two times for wm8904
Remove one

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
 sound/soc/codecs/wm8904.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index dc4262e..7c8df52 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1185,8 +1185,6 @@ static int wm8904_add_widgets(struct snd_soc_codec *codec)
 		snd_soc_dapm_new_controls(dapm, wm8904_dapm_widgets,
 					  ARRAY_SIZE(wm8904_dapm_widgets));
 
-		snd_soc_dapm_add_routes(dapm, core_intercon,
-					ARRAY_SIZE(core_intercon));
 		snd_soc_dapm_add_routes(dapm, adc_intercon,
 					ARRAY_SIZE(adc_intercon));
 		snd_soc_dapm_add_routes(dapm, dac_intercon,
-- 
1.7.9.5

Re: [Resend PATCH] ASoC: wm8904: remove redundant code

[Mark Brown]

On Wed, Sep 19, 2012 at 01:52:49PM +0800, Bo Shen wrote:
> The core_intercon register two times for wm8904
> Remove one

This patch is already present in -next...  it had been applied and not
pushed from the looks of it.

Re: [Resend PATCH] ASoC: wm8904: remove redundant code

[Shen, Voice]

在 2012-9-19，19:48，"Mark Brown" <broonie@opensource.wolfsonmicro.com> 写道：

> On Wed, Sep 19, 2012 at 01:52:49PM +0800, Bo Shen wrote:
>> The core_intercon register two times for wm8904
>> Remove one
> 
> This patch is already present in -next...  it had been applied and not
> pushed from the looks of it.

Got it, thanks.