diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 10:36:23 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:47:24 -0500 |
commit | a1f80fcfd51c81960bb32601d9aa0acda9d62504 (patch) | |
tree | e35bac589da88018f9461a65e8d32c7418fa4710 /sound/pci | |
parent | 64878dfbf755446f025965b742e56e4739a33b37 (diff) |
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>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/oxygen/oxygen.h | 1 | ||||
-rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index 2c5fb9edcb1..c2ae63d17cd 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h | |||
@@ -129,7 +129,6 @@ struct oxygen { | |||
129 | u8 pcm_running; | 129 | u8 pcm_running; |
130 | u8 dac_routing; | 130 | u8 dac_routing; |
131 | u8 spdif_playback_enable; | 131 | u8 spdif_playback_enable; |
132 | u8 revision; | ||
133 | u8 has_ac97_0; | 132 | u8 has_ac97_0; |
134 | u8 has_ac97_1; | 133 | u8 has_ac97_1; |
135 | u32 spdif_bits; | 134 | u32 spdif_bits; |
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 77e1f080563..70b739816fc 100644 --- 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) | |||
372 | (IEC958_AES1_CON_PCM_CODER << OXYGEN_SPDIF_CATEGORY_SHIFT); | 372 | (IEC958_AES1_CON_PCM_CODER << OXYGEN_SPDIF_CATEGORY_SHIFT); |
373 | chip->spdif_pcm_bits = chip->spdif_bits; | 373 | chip->spdif_pcm_bits = chip->spdif_bits; |
374 | 374 | ||
375 | if (oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_REVISION_2) | 375 | if (!(oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_REVISION_2)) |
376 | chip->revision = 2; | ||
377 | else | ||
378 | chip->revision = 1; | ||
379 | |||
380 | if (chip->revision == 1) | ||
381 | oxygen_set_bits8(chip, OXYGEN_MISC, | 376 | oxygen_set_bits8(chip, OXYGEN_MISC, |
382 | OXYGEN_MISC_PCI_MEM_W_1_CLOCK); | 377 | OXYGEN_MISC_PCI_MEM_W_1_CLOCK); |
383 | 378 | ||
@@ -669,8 +664,8 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, | |||
669 | 664 | ||
670 | strcpy(card->driver, chip->model.chip); | 665 | strcpy(card->driver, chip->model.chip); |
671 | strcpy(card->shortname, chip->model.shortname); | 666 | strcpy(card->shortname, chip->model.shortname); |
672 | sprintf(card->longname, "%s (rev %u) at %#lx, irq %i", | 667 | sprintf(card->longname, "%s at %#lx, irq %i", |
673 | chip->model.longname, chip->revision, chip->addr, chip->irq); | 668 | chip->model.longname, chip->addr, chip->irq); |
674 | strcpy(card->mixername, chip->model.chip); | 669 | strcpy(card->mixername, chip->model.chip); |
675 | snd_component_add(card, chip->model.chip); | 670 | snd_component_add(card, chip->model.chip); |
676 | 671 | ||