Merge branch 'linus' into core/printk

[linux-2.6] / sound / pci / emu10k1 / emumixer.c

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 7ebf035b6b08ead423ccf743cb4b66625fc0a809..fd221209abcb221f6db0dcf323476b8620e40331 100644 (file)
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -397,7 +397,7 @@ static int snd_emu1010_input_output_source_info(struct snd_kcontrol *kcontrol,
 
        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
        uinfo->count = 1;
-       if (emu->card_capabilities->emu_model == 3) { /* 1616(m) cardbus */
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
                uinfo->value.enumerated.items = 49;
                items = emu1616_src_texts;
        } else {
@@ -421,7 +421,8 @@ static int snd_emu1010_output_source_get(struct snd_kcontrol *kcontrol,
        channel = (kcontrol->private_value) & 0xff;
        /* Limit: emu1010_output_dst, emu->emu1010.output_source */
        if (channel >= 24 ||
-           (emu->card_capabilities->emu_model == 3 && channel >= 18))
+           (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+            channel >= 18))
                return -EINVAL;
        ucontrol->value.enumerated.item[0] = emu->emu1010.output_source[channel];
        return 0;
@@ -436,17 +437,19 @@ static int snd_emu1010_output_source_put(struct snd_kcontrol *kcontrol,
 
        val = ucontrol->value.enumerated.item[0];
        if (val >= 53 ||
-           (emu->card_capabilities->emu_model == 3 && val >= 49))
+           (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+            val >= 49))
                return -EINVAL;
        channel = (kcontrol->private_value) & 0xff;
        /* Limit: emu1010_output_dst, emu->emu1010.output_source */
        if (channel >= 24 ||
-           (emu->card_capabilities->emu_model == 3 && channel >= 18))
+           (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+            channel >= 18))
                return -EINVAL;
        if (emu->emu1010.output_source[channel] == val)
                return 0;
        emu->emu1010.output_source[channel] = val;
-       if (emu->card_capabilities->emu_model == 3) /* 1616(m) cardbus */
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
                snd_emu1010_fpga_link_dst_src_write(emu,
                        emu1616_output_dst[channel], emu1616_src_regs[val]);
        else
@@ -478,7 +481,8 @@ static int snd_emu1010_input_source_put(struct snd_kcontrol *kcontrol,
 
        val = ucontrol->value.enumerated.item[0];
        if (val >= 53 ||
-           (emu->card_capabilities->emu_model == 3 && val >= 49))
+           (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+            val >= 49))
                return -EINVAL;
        channel = (kcontrol->private_value) & 0xff;
        /* Limit: emu1010_input_dst, emu->emu1010.input_source */
@@ -487,7 +491,7 @@ static int snd_emu1010_input_source_put(struct snd_kcontrol *kcontrol,
        if (emu->emu1010.input_source[channel] == val)
                return 0;
        emu->emu1010.input_source[channel] = val;
-       if (emu->card_capabilities->emu_model == 3) /* 1616(m) cardbus */
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
                snd_emu1010_fpga_link_dst_src_write(emu,
                        emu1010_input_dst[channel], emu1616_src_regs[val]);
        else
@@ -1991,7 +1995,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                        return err;
        }
 
-       if (emu->card_capabilities->emu_model == 3) {
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
                /* 1616(m) cardbus */
                int i;