[alsa-devel] [PATCH] Revert "ALSA: hda - Shut up pins at power-saving mode with Conexnat codecs"

[Takashi Iwai]

At Wed, 19 Dec 2012 09:44:47 +0100,
David Henningsson wrote:
> 
> This reverts commit 697c373e34613609cb5450f98b91fefb6e910588.
> 
> The original patch was meant to remove clicking, but in fact caused even
> more clicking instead.
> 
> Thanks to c4pp4 for doing most of the work with this bug.
> 
> BugLink: https://bugs.launchpad.net/bugs/886975
> Signed-off-by: David Henningsson <david.henningsson at canonical.com>
> ---
> 
> @c4pp4: Is this consistent with what you have done to reduce the clicking?
> Will you recommend upstream Linux to take the patch below?

So, it shouldn't be merged yet right now?
Now is the last chance for merging it to 3.8-rc1.


Takashi

> 
>  sound/pci/hda/patch_conexant.c |   16 ----------------
>  1 file changed, 16 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
> index 60890bf..dd798c3 100644
> --- a/sound/pci/hda/patch_conexant.c
> +++ b/sound/pci/hda/patch_conexant.c
> @@ -558,24 +558,12 @@ static int conexant_build_controls(struct hda_codec *codec)
>  	return 0;
>  }
>  
> -#ifdef CONFIG_PM
> -static int conexant_suspend(struct hda_codec *codec)
> -{
> -	snd_hda_shutup_pins(codec);
> -	return 0;
> -}
> -#endif
> -
>  static const struct hda_codec_ops conexant_patch_ops = {
>  	.build_controls = conexant_build_controls,
>  	.build_pcms = conexant_build_pcms,
>  	.init = conexant_init,
>  	.free = conexant_free,
>  	.set_power_state = conexant_set_power,
> -#ifdef CONFIG_PM
> -	.suspend = conexant_suspend,
> -#endif
> -	.reboot_notify = snd_hda_shutup_pins,
>  };
>  
>  #ifdef CONFIG_SND_HDA_INPUT_BEEP
> @@ -4405,10 +4393,6 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
>  	.init = cx_auto_init,
>  	.free = conexant_free,
>  	.unsol_event = snd_hda_jack_unsol_event,
> -#ifdef CONFIG_PM
> -	.suspend = conexant_suspend,
> -#endif
> -	.reboot_notify = snd_hda_shutup_pins,
>  };
>  
>  /*
> -- 
> 1.7.9.5
>