[ALSA] oxygen: make AC97 codec optional

[powerpc.git] / sound / pci / oxygen / oxygen_mixer.c

diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index fcb5813..8b08e6d 100644 (file)
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -524,7 +524,7 @@ static DECLARE_TLV_DB_SCALE(ac97_db_scale, -3450, 150, 0);
 static const struct snd_kcontrol_new controls[] = {
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name = "PCM Playback Volume",
+               .name = "Master Playback Volume",
                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                          SNDRV_CTL_ELEM_ACCESS_TLV_READ,
                .info = dac_volume_info,
@@ -536,7 +536,7 @@ static const struct snd_kcontrol_new controls[] = {
        },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name = "PCM Playback Switch",
+               .name = "Master Playback Switch",
                .info = snd_ctl_boolean_mono_info,
                .get = dac_mute_get,
                .put = dac_mute_put,
@@ -597,6 +597,9 @@ static const struct snd_kcontrol_new controls[] = {
                .info = spdif_info,
                .get = spdif_input_default_get,
        },
+};
+
+static const struct snd_kcontrol_new ac97_controls[] = {
        AC97_VOLUME("Mic Capture Volume", AC97_MIC),
        AC97_SWITCH("Mic Capture Switch", AC97_MIC, 15, 1),
        AC97_SWITCH("Mic Boost (+20dB)", AC97_MIC, 6, 0),
@@ -617,7 +620,9 @@ static void oxygen_any_ctl_free(struct snd_kcontrol *ctl)
                chip->controls[i] = NULL;
 }
 
-int oxygen_mixer_init(struct oxygen *chip)
+static int add_controls(struct oxygen *chip,
+                       const struct snd_kcontrol_new controls[],
+                       unsigned int count)
 {
        static const char *const known_ctl_names[CONTROL_COUNT] = {
                [CONTROL_SPDIF_PCM] =
@@ -633,11 +638,11 @@ int oxygen_mixer_init(struct oxygen *chip)
        struct snd_kcontrol *ctl;
        int err;
 
-       for (i = 0; i < ARRAY_SIZE(controls); ++i) {
+       for (i = 0; i < count; ++i) {
                ctl = snd_ctl_new1(&controls[i], chip);
                if (!ctl)
                        return -ENOMEM;
-               if (!strcmp(ctl->id.name, "PCM Playback Volume"))
+               if (!strcmp(ctl->id.name, "Master Playback Volume"))
                        ctl->tlv.p = chip->model->dac_tlv;
                else if (chip->model->cd_in_from_video_in &&
                         !strncmp(ctl->id.name, "CD Capture ", 11))
@@ -651,5 +656,21 @@ int oxygen_mixer_init(struct oxygen *chip)
                                ctl->private_free = oxygen_any_ctl_free;
                        }
        }
+       return 0;
+}
+
+int oxygen_mixer_init(struct oxygen *chip)
+{
+       int err;
+
+       err = add_controls(chip, controls, ARRAY_SIZE(controls));
+       if (err < 0)
+               return err;
+       if (chip->has_ac97_0) {
+               err = add_controls(chip, ac97_controls,
+                                  ARRAY_SIZE(ac97_controls));
+               if (err < 0)
+                       return err;
+       }
        return chip->model->mixer_init ? chip->model->mixer_init(chip) : 0;
 }