Changeset 598 for GPL/trunk/alsa-kernel/isa/gus/gusextreme.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/gus/gusextreme.c (modified) (7 diffs)

GPL/trunk/alsa-kernel/isa/gus/gusextreme.c

@@ -96 +96 @@
 
 static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
-                struct device *dev, unsigned int n, struct snd_es1688 **rchip)
+                struct snd_es1688 *chip, struct device *dev, unsigned int n)
 {
         static long possible_ports[] = {0x220, 0x240, 0x260};
@@ -120 +120 @@
 
         if (port[n] != SNDRV_AUTO_PORT)
-                return snd_es1688_create(card, port[n], mpu_port[n], irq[n],
-                                mpu_irq[n], dma8[n], ES1688_HW_1688, rchip);
+                return snd_es1688_create(card, chip, port[n], mpu_port[n],
+                                irq[n], mpu_irq[n], dma8[n], ES1688_HW_1688);
 
         i = 0;
         do {
                 port[n] = possible_ports[i];
-                error = snd_es1688_create(card, port[n], mpu_port[n], irq[n],
-                                mpu_irq[n], dma8[n], ES1688_HW_1688, rchip);
+                error = snd_es1688_create(card, chip, port[n], mpu_port[n],
+                                irq[n], mpu_irq[n], dma8[n], ES1688_HW_1688);
         } while (error < 0 && ++i < ARRAY_SIZE(possible_ports));
 
@@ -207 +207 @@
 }
 
-static int __devinit snd_gusextreme_mixer(struct snd_es1688 *chip)
-{
-        struct snd_card *card = chip->card;
+static int __devinit snd_gusextreme_mixer(struct snd_card *card)
+{
         struct snd_ctl_elem_id id1, id2;
         int error;
@@ -242 +241 @@
         int error;
 
-        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
+        error = snd_card_create(index[n], id[n], THIS_MODULE,
+                                sizeof(struct snd_es1688), &card);
         if (error < 0)
                 return error;
+
+        es1688 = card->private_data;
 
         if (mpu_port[n] == SNDRV_AUTO_PORT)
@@ -252 +254 @@
                 mpu_irq[n] = -1;
 
-        error = snd_gusextreme_es1688_create(card, dev, n, &es1688);
+        error = snd_gusextreme_es1688_create(card, es1688, dev, n);
         if (error < 0)
                 goto out;
@@ -281 +283 @@
         gus->codec_flag = 1;
 
-        error = snd_es1688_pcm(es1688, 0, NULL);
-        if (error < 0)
-                goto out;
-
-        error = snd_es1688_mixer(es1688);
+        error = snd_es1688_pcm(card, es1688, 0, NULL);
+        if (error < 0)
+                goto out;
+
+        error = snd_es1688_mixer(card, es1688);
         if (error < 0)
                 goto out;
@@ -301 +303 @@
                 goto out;
 
-        error = snd_gusextreme_mixer(es1688);
+        error = snd_gusextreme_mixer(card);
         if (error < 0)
                 goto out;