Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13eb4ab8 authored by Raymond Yau's avatar Raymond Yau Committed by Takashi Iwai
Browse files

ALSA: au88x0 - Use a better name for pcm devices of au88x0 



Signed-off-by: default avatarRaymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8ae9572b

sound/pci/au88x0/au8810.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#define CHIP_AU8810



#define CARD_NAME "Aureal Advantage 3D Sound Processor"

#define CARD_NAME "Aureal Advantage"

#define CARD_NAME_SHORT "au8810"



#define NR_ADB		0x10

sound/pci/au88x0/au8820.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


#define CHIP_AU8820



#define CARD_NAME "Aureal Vortex 3D Sound Processor"

#define CARD_NAME "Aureal Vortex"

#define CARD_NAME_SHORT "au8820"



/* Number of ADB and WT channels */

sound/pci/au88x0/au8830.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


#define CHIP_AU8830



#define CARD_NAME "Aureal Vortex 2 3D Sound Processor"

#define CARD_NAME "Aureal Vortex 2"

#define CARD_NAME_SHORT "au8830"



#define NR_ADB 0x20

sound/pci/au88x0/au88x0_pcm.c

+7 −6
Original line number Diff line number Diff line
@@ -423,11 +423,11 @@ static struct snd_pcm_ops snd_vortex_playback_ops = { 
*/



static char *vortex_pcm_prettyname[VORTEX_PCM_LAST] = {

	"AU88x0 ADB",

	"AU88x0 SPDIF",

	"AU88x0 A3D",

	"AU88x0 WT",

	"AU88x0 I2S",

	CARD_NAME " ADB",

	CARD_NAME " SPDIF",

	CARD_NAME " A3D",

	CARD_NAME " WT",

	CARD_NAME " I2S",

};

static char *vortex_pcm_name[VORTEX_PCM_LAST] = {

	"adb",
@@ -524,7 +524,8 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr) 
			  nr_capt, &pcm);

	if (err < 0)

		return err;

	strcpy(pcm->name, vortex_pcm_name[idx]);

	snprintf(pcm->name, sizeof(pcm->name),

		"%s %s", CARD_NAME_SHORT, vortex_pcm_name[idx]);

	chip->pcm[idx] = pcm;

	// This is an evil hack, but it saves a lot of duplicated code.

	VORTEX_PCM_TYPE(pcm) = idx;