ALSA: hda - Make CONFIG_SND_HDA_RECONFIG for codec reconfiguration

Make the codec re-configuration feature selectable via Kconfig,
CONFIG_SND_HDA_RECONFIG.
Also mark it as experimental (as it really is).

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 157a0a6b10ae15ff9b7338db478788992ae8bd2d..cc6cf89c32e6704cee8b7af37a5bd006f51263c8 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -518,6 +518,15 @@ config SND_HDA_HWDEP
          This interface can be used for out-of-band communication
          with codecs for debugging purposes.
 
+config SND_HDA_RECONFIG
+       bool "Allow dynamic codec reconfiguration (EXPERIMENTAL)"
+       depends on SND_HDA_HWDEP && EXPERIMENTAL
+       help
+         Say Y here to enable the HD-audio codec re-configuration feature.
+         This adds the sysfs interfaces to allow user to clear the whole
+         codec configuration, change the codec setup, add extra verbs,
+         and re-configure the codec dynamically.
+
 config SND_HDA_INPUT_BEEP
        bool "Support digital beep via input layer"
        depends on SND_HDA_INTEL

diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 653da1d3e4dfb6018f489d90ec1226e5988fecfb..5868bbc131cd8a806071f78276d3855dc97659ea 100644 (file)
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -145,6 +145,8 @@ int __devinit snd_hda_create_hwdep(struct hda_codec *codec)
        return 0;
 }
 
+#ifdef CONFIG_SND_HDA_RECONFIG
+
 /*
  * sysfs interface
  */
@@ -347,3 +349,5 @@ int snd_hda_hwdep_add_sysfs(struct hda_codec *codec)
                                          hwdep->device, &codec_attrs[i]);
        return 0;
 }
+
+#endif /* CONFIG_SND_HDA_RECONFIG */

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index bf7ba8b62973f0ed05fc98727d28c7186218007a..6f2fe0f9fdd8acfeaeeab7f478be6abb39889d91 100644 (file)
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -409,11 +409,19 @@ void snd_hda_ctls_clear(struct hda_codec *codec);
  */
 #ifdef CONFIG_SND_HDA_HWDEP
 int snd_hda_create_hwdep(struct hda_codec *codec);
-int snd_hda_hwdep_add_sysfs(struct hda_codec *codec);
 #else
 static inline int snd_hda_create_hwdep(struct hda_codec *codec) { return 0; }
 #endif
 
+#ifdef CONFIG_SND_HDA_RECONFIG
+int snd_hda_hwdep_add_sysfs(struct hda_codec *codec);
+#else
+static inline int snd_hda_hwdep_add_sysfs(struct hda_codec *codec)
+{
+       return 0;
+}
+#endif
+
 /*
  * power-management
  */