diff options
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 6 | ||||
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index ec4536c8d8d4..69acbf758bbb 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
| @@ -932,7 +932,7 @@ int snd_hda_bus_new(struct snd_card *card, | |||
| 932 | } | 932 | } |
| 933 | EXPORT_SYMBOL_GPL(snd_hda_bus_new); | 933 | EXPORT_SYMBOL_GPL(snd_hda_bus_new); |
| 934 | 934 | ||
| 935 | #ifdef CONFIG_SND_HDA_GENERIC | 935 | #if IS_ENABLED(CONFIG_SND_HDA_GENERIC) |
| 936 | #define is_generic_config(codec) \ | 936 | #define is_generic_config(codec) \ |
| 937 | (codec->modelname && !strcmp(codec->modelname, "generic")) | 937 | (codec->modelname && !strcmp(codec->modelname, "generic")) |
| 938 | #else | 938 | #else |
| @@ -1570,7 +1570,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec) | |||
| 1570 | EXPORT_SYMBOL_GPL(snd_hda_codec_update_widgets); | 1570 | EXPORT_SYMBOL_GPL(snd_hda_codec_update_widgets); |
| 1571 | 1571 | ||
| 1572 | 1572 | ||
| 1573 | #ifdef CONFIG_SND_HDA_CODEC_HDMI | 1573 | #if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) |
| 1574 | /* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */ | 1574 | /* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */ |
| 1575 | static bool is_likely_hdmi_codec(struct hda_codec *codec) | 1575 | static bool is_likely_hdmi_codec(struct hda_codec *codec) |
| 1576 | { | 1576 | { |
| @@ -1622,7 +1622,7 @@ int snd_hda_codec_configure(struct hda_codec *codec) | |||
| 1622 | unload_parser(codec); /* to be sure */ | 1622 | unload_parser(codec); /* to be sure */ |
| 1623 | if (is_likely_hdmi_codec(codec)) | 1623 | if (is_likely_hdmi_codec(codec)) |
| 1624 | patch = load_parser(codec, snd_hda_parse_hdmi_codec); | 1624 | patch = load_parser(codec, snd_hda_parse_hdmi_codec); |
| 1625 | #ifdef CONFIG_SND_HDA_GENERIC | 1625 | #if IS_ENABLED(CONFIG_SND_HDA_GENERIC) |
| 1626 | if (!patch) | 1626 | if (!patch) |
| 1627 | patch = load_parser(codec, snd_hda_parse_generic_codec); | 1627 | patch = load_parser(codec, snd_hda_parse_generic_codec); |
| 1628 | #endif | 1628 | #endif |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index fa2879a21a50..e354ab1ec20f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -198,7 +198,7 @@ MODULE_DESCRIPTION("Intel HDA driver"); | |||
| 198 | #endif | 198 | #endif |
| 199 | 199 | ||
| 200 | #if defined(CONFIG_PM) && defined(CONFIG_VGA_SWITCHEROO) | 200 | #if defined(CONFIG_PM) && defined(CONFIG_VGA_SWITCHEROO) |
| 201 | #ifdef CONFIG_SND_HDA_CODEC_HDMI | 201 | #if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) |
| 202 | #define SUPPORT_VGA_SWITCHEROO | 202 | #define SUPPORT_VGA_SWITCHEROO |
| 203 | #endif | 203 | #endif |
| 204 | #endif | 204 | #endif |
