summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c10
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;
}
OpenPOWER on IntegriCloud