OSDN Git Service

ALSA: emu10k1: Drop superfluous id-uniquification behavior
authorTakashi Iwai <tiwai@suse.de>
Tue, 16 Apr 2019 16:01:46 +0000 (18:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 17 Apr 2019 05:16:12 +0000 (07:16 +0200)
The emu10k1 driver tries to create a unique id string by itself when
it's copied from the card list, but it's rather superfluous, as the
same thing will be done in ALSA core side at the card registration.
Let's drop the code.  This allows us removing snd_cards export.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/emu10k1/emu10k1_main.c

index 61f85ff..0419c75 100644 (file)
@@ -1882,22 +1882,8 @@ int snd_emu10k1_create(struct snd_card *card,
                        c->name, pci->vendor, pci->device,
                        emu->serial);
 
-       if (!*card->id && c->id) {
-               int i, n = 0;
+       if (!*card->id && c->id)
                strlcpy(card->id, c->id, sizeof(card->id));
-               for (;;) {
-                       for (i = 0; i < snd_ecards_limit; i++) {
-                               if (snd_cards[i] && !strcmp(snd_cards[i]->id, card->id))
-                                       break;
-                       }
-                       if (i >= snd_ecards_limit)
-                               break;
-                       n++;
-                       if (n >= SNDRV_CARDS)
-                               break;
-                       snprintf(card->id, sizeof(card->id), "%s_%d", c->id, n);
-               }
-       }
 
        is_audigy = emu->audigy = c->emu10k2_chip;