staging: most: sound: use static name for ALSA card
authorChristian Gromm <christian.gromm@microchip.com>
Mon, 17 Dec 2018 14:10:15 +0000 (15:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Dec 2018 15:10:20 +0000 (16:10 +0100)
This patch uses a static name for the sound card's short name and
long name. Having the card names configurable doesn't make sense
anymore, as the card represents the same physical hardware.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/most/sound/sound.c

index 6a453d7e65cdf5e3a9283ce7c682f74f51b67578..c6986310518efd163c2ed124f7b87172f7eecf54 100644 (file)
@@ -622,14 +622,14 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,
        INIT_LIST_HEAD(&adpt->dev_list);
        iface->priv = adpt;
        list_add_tail(&adpt->list, &adpt_list);
-       ret = snd_card_new(&iface->dev, -1, device_name, THIS_MODULE,
+       ret = snd_card_new(&iface->dev, -1, "INIC", THIS_MODULE,
                           sizeof(*channel), &adpt->card);
        if (ret < 0)
                goto err_free_adpt;
        snprintf(adpt->card->driver, sizeof(adpt->card->driver),
                 "%s", DRIVER_NAME);
        snprintf(adpt->card->shortname, sizeof(adpt->card->shortname),
-                "Microchip MOST:%d", adpt->card->number);
+                "Microchip INIC");
        snprintf(adpt->card->longname, sizeof(adpt->card->longname),
                 "%s at %s, ch %d", adpt->card->shortname, iface->description,
                 channel_id);