[ALSA] snd-emu10k1: Card capabilities tidy up.

EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>

2 files changed, 7 insertions, 5 deletions

diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 2085a998eaeb..2f96b2fc74fb 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -140,7 +140,7 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
                 return err;
         }
         /* This stores the periods table. */
-        if (emu->audigy && emu->revision == 4) { /* P16V */     
+        if (emu->card_capabilities->ca0151_chip) { /* P16V */   
                 if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), 1024, &emu->p16v_buffer) < 0) {
                         snd_p16v_free(emu);
                         return -ENOMEM;
@@ -161,7 +161,7 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
                 snd_card_free(card);
                 return err;
         }
-        if (emu->audigy && emu->revision == 4) { /* P16V */     
+        if (emu->card_capabilities->ca0151_chip) { /* P16V */   
                 if ((err = snd_p16v_pcm(emu, 4, NULL)) < 0) {
                         snd_card_free(card);
                         return err;
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index a341e758acde..9478a95e410f 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -191,7 +191,7 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                 /* Set playback routing. */
                 snd_emu10k1_ptr20_write(emu, CAPTURE_P16V_SOURCE, 0, 0x78e4);
         }
-        if (emu->audigy && (emu->serial == 0x10011102) ) { /* audigy2 Value */
+        if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
                 /* Hacks for Alice3 to work independent of haP16V driver */
                 u32 tmp;
 
@@ -253,6 +253,8 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                              HCFG_AUTOMUTE | HCFG_JOYENABLE, emu->port + HCFG);
                 else
                         outl(HCFG_AUTOMUTE | HCFG_JOYENABLE, emu->port + HCFG);
+        /* FIXME: Remove all these emu->model and replace it with a card recognition parameter,
+         * e.g. card_capabilities->joystick */
         } else if (emu->model == 0x20 ||
             emu->model == 0xc400 ||
             (emu->model == 0x21 && emu->revision < 6))
@@ -299,12 +301,12 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
         if (emu->audigy) {
                 outl(inl(emu->port + A_IOCFG) & ~0x44, emu->port + A_IOCFG);
  
-                if (emu->revision == 4) { /* audigy2 */
+                if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
                         /* Unmute Analog now.  Set GPO6 to 1 for Apollo.
                          * This has to be done after init ALice3 I2SOut beyond 48KHz.
                          * So, sequence is important. */
                         outl(inl(emu->port + A_IOCFG) | 0x0040, emu->port + A_IOCFG);
-                } else if (emu->serial == 0x10011102) { /* audigy2 value */
+                } else if (emu->card_capabilities->ca0108_chip) { /* audigy2 value */
                         /* Unmute Analog now. */
                         outl(inl(emu->port + A_IOCFG) | 0x0060, emu->port + A_IOCFG);
                 } else {