[alsa-devel] [PATCH] ALSA: hda - remove check on CONFIG_SND_HDA_I915 in azx_probe_continue()

[Takashi Iwai]

At Thu, 30 Apr 2015 15:10:18 +0800,
mengdong.lin at intel.com wrote:
> 
> From: Mengdong Lin <mengdong.lin at intel.com>
> 
> This is to avoid a build warning that label 'i915_power_fail' is defined
> but not used.
> 
> There are already fake hda_i915 functions when CONFIG_SND_HDA_I915 is not
> defined, and error message for missing CONFIG_SND_HDA_I915 for the HD-A
> controller or codec that depends on i915 power well.
> 
> Signed-off-by: Mengdong Lin <mengdong.lin at intel.com>

It's not enough since hda_i915_init() returns an error for
CONFIG_SND_HDA_I915=n.  But I already fixed it, so don't worry about
this.


Takashi

> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 5aa5cfa..87df90d 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip)
>  		if (pci->device != 0x0f04 && pci->device != 0x2284)
>  			hda->need_i915_power = 1;
>  
> -
> -#ifdef CONFIG_SND_HDA_I915
>  		err = hda_i915_init(hda);
>  		if (err < 0)
>  			goto i915_power_fail;
> @@ -1919,7 +1917,6 @@ static int azx_probe_continue(struct azx *chip)
>  				"Cannot turn on display power on i915\n");
>  			goto i915_power_fail;
>  		}
> -#endif
>  	}
>  
>  	err = azx_first_init(chip);
> -- 
> 1.9.1
>