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

Commit a1f80fcf authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: oxygen: do not show chip revision in card longname 



Apparently, the revision is 2 on all sold sound cards, so this
information is not actually useful.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 64878dfb

sound/pci/oxygen/oxygen.h

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ struct oxygen { 
	u8 pcm_running;

	u8 dac_routing;

	u8 spdif_playback_enable;

	u8 revision;

	u8 has_ac97_0;

	u8 has_ac97_1;

	u32 spdif_bits;

sound/pci/oxygen/oxygen_lib.c

+3 −8
Original line number Diff line number Diff line
@@ -372,12 +372,7 @@ static void oxygen_init(struct oxygen *chip) 
		(IEC958_AES1_CON_PCM_CODER << OXYGEN_SPDIF_CATEGORY_SHIFT);

	chip->spdif_pcm_bits = chip->spdif_bits;



	if (oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_REVISION_2)

		chip->revision = 2;

	else

		chip->revision = 1;



	if (chip->revision == 1)

	if (!(oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_REVISION_2))

		oxygen_set_bits8(chip, OXYGEN_MISC,

				 OXYGEN_MISC_PCI_MEM_W_1_CLOCK);
@@ -669,8 +664,8 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, 


	strcpy(card->driver, chip->model.chip);

	strcpy(card->shortname, chip->model.shortname);

	sprintf(card->longname, "%s (rev %u) at %#lx, irq %i",

		chip->model.longname, chip->revision, chip->addr, chip->irq);

	sprintf(card->longname, "%s at %#lx, irq %i",

		chip->model.longname, chip->addr, chip->irq);

	strcpy(card->mixername, chip->model.chip);

	snd_component_add(card, chip->model.chip);