openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hda - Fix leftover ifdef checks after modularization 

Since the commit [595fe1b702c3: ALSA: hda - Make
CONFIG_SND_HDA_CODEC_* tristate], the kconfig variables for the
generic parser and codec drivers can be "m" instead of boolean, but
some codes are left unchanged to check only #ifdef
CONFIG_SND_HDA_CODEC_XXX, which is no longer true for modules.
This patch fixes them by replacing with IS_ENABLED() macros.

Fixes: 595fe1b702 ('ALSA: hda - Make CONFIG_SND_HDA_CODEC_* tristate')
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=70161
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-02-06 18:14:03 +01:00
parent 276ab336b4
commit f8f1becfa4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/pci/hda/hda_codec.c
View File

@ -932,7 +932,7 @@ int snd_hda_bus_new(struct snd_card *card,
} }
EXPORT_SYMBOL_GPL(snd_hda_bus_new); EXPORT_SYMBOL_GPL(snd_hda_bus_new);
#ifdef CONFIG_SND_HDA_GENERIC #if IS_ENABLED(CONFIG_SND_HDA_GENERIC)
#define is_generic_config(codec) \ #define is_generic_config(codec) \
(codec->modelname && !strcmp(codec->modelname, "generic")) (codec->modelname && !strcmp(codec->modelname, "generic"))
#else #else
@ -1570,7 +1570,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec)
EXPORT_SYMBOL_GPL(snd_hda_codec_update_widgets); EXPORT_SYMBOL_GPL(snd_hda_codec_update_widgets);
#ifdef CONFIG_SND_HDA_CODEC_HDMI #if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
/* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */ /* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */
static bool is_likely_hdmi_codec(struct hda_codec *codec) static bool is_likely_hdmi_codec(struct hda_codec *codec)
{ {
@ -1622,7 +1622,7 @@ int snd_hda_codec_configure(struct hda_codec *codec)
unload_parser(codec); /* to be sure */ unload_parser(codec); /* to be sure */
if (is_likely_hdmi_codec(codec)) if (is_likely_hdmi_codec(codec))
patch = load_parser(codec, snd_hda_parse_hdmi_codec); patch = load_parser(codec, snd_hda_parse_hdmi_codec);
#ifdef CONFIG_SND_HDA_GENERIC #if IS_ENABLED(CONFIG_SND_HDA_GENERIC)
if (!patch) if (!patch)
patch = load_parser(codec, snd_hda_parse_generic_codec); patch = load_parser(codec, snd_hda_parse_generic_codec);
#endif #endif

2
sound/pci/hda/hda_intel.c
View File

@ -198,7 +198,7 @@ MODULE_DESCRIPTION("Intel HDA driver");
#endif #endif
#if defined(CONFIG_PM) && defined(CONFIG_VGA_SWITCHEROO) #if defined(CONFIG_PM) && defined(CONFIG_VGA_SWITCHEROO)
#ifdef CONFIG_SND_HDA_CODEC_HDMI #if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
#define SUPPORT_VGA_SWITCHEROO #define SUPPORT_VGA_SWITCHEROO
#endif #endif
#endif #endif