diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-03-26 11:04:38 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-03-26 11:08:43 +0100 |
| commit | 10e77ddac0e1f3b9cea04dfe8180f8641f329703 (patch) | |
| tree | e93280793b107864e9ffdbf5a406b82f607e9faf /sound/pci/hda/hda_codec.c | |
| parent | 0bf0e5a6f304ac1bc93a80cdd68b4d91f3519eb5 (diff) | |
| download | talos-obmc-linux-10e77ddac0e1f3b9cea04dfe8180f8641f329703.tar.gz talos-obmc-linux-10e77ddac0e1f3b9cea04dfe8180f8641f329703.zip | |
ALSA: hda-intel - remove model=hwio , use probe_only=3 instead
The probe_only module parameter skips the codec initialization, too.
Remove the model=hwio code and use second bit in probe_only to
skip the HDA codec reset procedure.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index cf6280bdaa19..0e76ac2b2ace 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -609,15 +609,11 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, } EXPORT_SYMBOL_HDA(snd_hda_bus_new); -#define is_hwio_config(codec) \ - (codec->modelname && !strcmp(codec->modelname, "hwio")) #ifdef CONFIG_SND_HDA_GENERIC #define is_generic_config(codec) \ - ((codec->modelname && !strcmp(codec->modelname, "generic")) || \ - is_hwio_config(codec)) + (codec->modelname && !strcmp(codec->modelname, "generic")) #else -#define is_generic_config(codec) \ - is_hwio_config(codec) +#define is_generic_config(codec) 0 #endif #ifdef MODULE @@ -1117,8 +1113,6 @@ int snd_hda_codec_configure(struct hda_codec *codec) } if (is_generic_config(codec)) { - if (is_hwio_config(codec)) - goto patched; err = snd_hda_parse_generic_codec(codec); goto patched; } |
