提交 b080ebbf 编写于 作者: C Clemens Ladisch 提交者: Jaroslav Kysela

[ALSA] cmipci: remove has_dual_dac

Remove the has_dual_dac variable because it was always set.
Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
Signed-off-by: NJaroslav Kysela <perex@suse.cz>
上级 133271fe
...@@ -424,7 +424,6 @@ struct cmipci { ...@@ -424,7 +424,6 @@ struct cmipci {
int chip_version; int chip_version;
int max_channels; int max_channels;
unsigned int has_dual_dac: 1;
unsigned int can_ac3_sw: 1; unsigned int can_ac3_sw: 1;
unsigned int can_ac3_hw: 1; unsigned int can_ac3_hw: 1;
unsigned int can_multi_ch: 1; unsigned int can_multi_ch: 1;
...@@ -2643,7 +2642,6 @@ static void __devinit query_chip(struct cmipci *cm) ...@@ -2643,7 +2642,6 @@ static void __devinit query_chip(struct cmipci *cm)
break; break;
} }
cm->max_channels = 2; cm->max_channels = 2;
cm->has_dual_dac = 1;
} else { } else {
if (detect & CM_CHIP_039) { if (detect & CM_CHIP_039) {
cm->chip_version = 39; cm->chip_version = 39;
...@@ -2659,7 +2657,6 @@ static void __devinit query_chip(struct cmipci *cm) ...@@ -2659,7 +2657,6 @@ static void __devinit query_chip(struct cmipci *cm)
cm->max_channels = 6; cm->max_channels = 6;
} }
cm->can_ac3_hw = 1; cm->can_ac3_hw = 1;
cm->has_dual_dac = 1;
cm->can_multi_ch = 1; cm->can_multi_ch = 1;
} }
} }
...@@ -2975,11 +2972,9 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc ...@@ -2975,11 +2972,9 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
if ((err = snd_cmipci_pcm_new(cm, pcm_index)) < 0) if ((err = snd_cmipci_pcm_new(cm, pcm_index)) < 0)
return err; return err;
pcm_index++; pcm_index++;
if (cm->has_dual_dac) { if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0)
if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0) return err;
return err; pcm_index++;
pcm_index++;
}
if (cm->can_ac3_hw || cm->can_ac3_sw) { if (cm->can_ac3_hw || cm->can_ac3_sw) {
pcm_spdif_index = pcm_index; pcm_spdif_index = pcm_index;
if ((err = snd_cmipci_pcm_spdif_new(cm, pcm_index)) < 0) if ((err = snd_cmipci_pcm_spdif_new(cm, pcm_index)) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册