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: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index 2c5fb9edcb115f6adcbbfdcb3119a40071dc5b2a..c2ae63d17cd2c893523092908dc98925f03753ee 100644 (file)
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -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;

diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 77e1f0805633fee8a81a9204220a7516cc83bdea..70b739816fcc46fcde313ef5d6552c39902784ec 100644 (file)
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -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);