summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorChristian Gromm <christian.gromm@microchip.com>2018-12-17 15:10:15 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-17 16:10:20 +0100
commit6cebb201963677795e8828c858c2e1502ba39b55 (patch)
treecc6542404f558dca2c9cb643dfaf1282ed5d2f73 /drivers/staging
parent4c6375dc1c03a5097cb9f3575a441c15b270e397 (diff)
downloadlinux-6cebb201963677795e8828c858c2e1502ba39b55.tar.gz
linux-6cebb201963677795e8828c858c2e1502ba39b55.tar.bz2
linux-6cebb201963677795e8828c858c2e1502ba39b55.zip
staging: most: sound: use static name for ALSA card
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/most/sound/sound.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/most/sound/sound.c b/drivers/staging/most/sound/sound.c
index 6a453d7e65cd..c6986310518e 100644
--- a/drivers/staging/most/sound/sound.c
+++ b/drivers/staging/most/sound/sound.c
@@ -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);