]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n
authorTakashi Iwai <tiwai@suse.de>
Tue, 27 Jan 2009 11:53:22 +0000 (12:53 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 27 Jan 2009 11:54:10 +0000 (12:54 +0100)
  sound/pci/hda/patch_conexant.c:352: warning: 'conexant_add_jack' defined but not used

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_conexant.c

index 9ae72b803f2ddf0d012e02db11b0d97a8ffc94f3..0177ef8f4c9e9f2af8206a21c307d6795e3dbbd3 100644 (file)
@@ -347,6 +347,7 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol,
                                     &spec->cur_mux[adc_idx]);
 }
 
+#ifdef CONFIG_SND_JACK
 static int conexant_add_jack(struct hda_codec *codec,
                hda_nid_t nid, int type)
 {
@@ -394,7 +395,6 @@ static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)
 
 static int conexant_init_jacks(struct hda_codec *codec)
 {
-#ifdef CONFIG_SND_JACK
        struct conexant_spec *spec = codec->spec;
        int i;
 
@@ -422,10 +422,19 @@ static int conexant_init_jacks(struct hda_codec *codec)
                        ++hv;
                }
        }
-#endif
        return 0;
 
 }
+#else
+static inline void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)
+{
+}
+
+static inline int conexant_init_jacks(struct hda_codec *codec)
+{
+       return 0;
+}
+#endif
 
 static int conexant_init(struct hda_codec *codec)
 {