[ALSA] clean up card features

EMU10K1/EMU10K2 driver
This patch converts the emu10k1 driver to use the card capabilities
structure for some more things.

Not extensively tested but seems to work.

Signed-off-by: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 044663d31aa7..d0b296587cc0 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -791,7 +791,7 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                 NULL
         };
 
-        if (!emu->no_ac97) {
+        if (emu->card_capabilities->ac97_chip) {
                 ac97_bus_t *pbus;
                 ac97_template_t ac97;
                 static ac97_bus_ops_t ops = {
@@ -833,7 +833,7 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                 for (; *c; c++)
                         remove_ctl(card, *c);
         } else {
-                if (emu->APS)
+                if (emu->card_capabilities->ecard)
                         strcpy(emu->card->mixername, "EMU APS");
                 else if (emu->audigy)
                         strcpy(emu->card->mixername, "SB Audigy");
@@ -918,7 +918,7 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                 mix->attn[0] = 0xffff;
         }
         
-        if (! emu->APS) { /* FIXME: APS has these controls? */
+        if (! emu->card_capabilities->ecard) { /* FIXME: APS has these controls? */
                 /* sb live! and audigy */
                 if ((kctl = snd_ctl_new1(&snd_emu10k1_spdif_mask_control, emu)) == NULL)
                         return -ENOMEM;
@@ -939,14 +939,14 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                         return -ENOMEM;
                 if ((err = snd_ctl_add(card, kctl)))
                         return err;
-        } else if (! emu->APS) {
+        } else if (! emu->card_capabilities->ecard) {
                 /* sb live! */
                 if ((kctl = snd_ctl_new1(&snd_emu10k1_shared_spdif, emu)) == NULL)
                         return -ENOMEM;
                 if ((err = snd_ctl_add(card, kctl)))
                         return err;
         }
-        if (emu->audigy && emu->revision == 4) { /* P16V */
+        if (emu->card_capabilities->ca0151_chip) { /* P16V */
                 if ((err = snd_p16v_mixer(emu)))
                         return err;
         }