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

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
...@@ -129,7 +129,6 @@ struct oxygen { ...@@ -129,7 +129,6 @@ struct oxygen {
u8 pcm_running; u8 pcm_running;
u8 dac_routing; u8 dac_routing;
u8 spdif_playback_enable; u8 spdif_playback_enable;
u8 revision;
u8 has_ac97_0; u8 has_ac97_0;
u8 has_ac97_1; u8 has_ac97_1;
u32 spdif_bits; u32 spdif_bits;
......
...@@ -372,12 +372,7 @@ static void oxygen_init(struct oxygen *chip) ...@@ -372,12 +372,7 @@ static void oxygen_init(struct oxygen *chip)
(IEC958_AES1_CON_PCM_CODER << OXYGEN_SPDIF_CATEGORY_SHIFT); (IEC958_AES1_CON_PCM_CODER << OXYGEN_SPDIF_CATEGORY_SHIFT);
chip->spdif_pcm_bits = chip->spdif_bits; chip->spdif_pcm_bits = chip->spdif_bits;
if (oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_REVISION_2) if (!(oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_REVISION_2))
chip->revision = 2;
else
chip->revision = 1;
if (chip->revision == 1)
oxygen_set_bits8(chip, OXYGEN_MISC, oxygen_set_bits8(chip, OXYGEN_MISC,
OXYGEN_MISC_PCI_MEM_W_1_CLOCK); OXYGEN_MISC_PCI_MEM_W_1_CLOCK);
...@@ -669,8 +664,8 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, ...@@ -669,8 +664,8 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
strcpy(card->driver, chip->model.chip); strcpy(card->driver, chip->model.chip);
strcpy(card->shortname, chip->model.shortname); strcpy(card->shortname, chip->model.shortname);
sprintf(card->longname, "%s (rev %u) at %#lx, irq %i", sprintf(card->longname, "%s at %#lx, irq %i",
chip->model.longname, chip->revision, chip->addr, chip->irq); chip->model.longname, chip->addr, chip->irq);
strcpy(card->mixername, chip->model.chip); strcpy(card->mixername, chip->model.chip);
snd_component_add(card, chip->model.chip); snd_component_add(card, chip->model.chip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment