diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-08-03 07:40:08 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-08-30 02:43:35 -0400 |
commit | 10e8d78a94fc57f1bf11d50b97ff85b005e46d0b (patch) | |
tree | ddb1cc2444c9e6a067e7d6f891f68260f5ce2434 /sound/pci/ac97 | |
parent | 506d4c6a5f909d78c3d624693f10d8cc0eafda48 (diff) |
[ALSA] use SNDRV_CTL_NAME_IEC958 macro
CMI8330 driver,ENS1370/1+ driver,FM801 driver,VIA82xx driver,AC97 Codec
ALI5451 driver,CS46xx driver,EMU10K1/EMU10K2 driver,HDA Codec driver
ICE1712 driver,ICE1724 driver
Where appropriate, use the SNDRV_CTL_NAME_IEC958 instead of a literal
string.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/ac97')
-rw-r--r-- | sound/pci/ac97/ac97_patch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index d4bb99fc896c..00fb51992460 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c | |||
@@ -1955,7 +1955,7 @@ static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = { | |||
1955 | }; | 1955 | }; |
1956 | 1956 | ||
1957 | static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc650[] = { | 1957 | static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc650[] = { |
1958 | AC97_SINGLE("IEC958 Capture Switch", AC97_ALC650_MULTICH, 11, 1, 0), | 1958 | AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_ALC650_MULTICH, 11, 1, 0), |
1959 | AC97_SINGLE("Analog to IEC958 Output", AC97_ALC650_MULTICH, 12, 1, 0), | 1959 | AC97_SINGLE("Analog to IEC958 Output", AC97_ALC650_MULTICH, 12, 1, 0), |
1960 | /* disable this controls since it doesn't work as expected */ | 1960 | /* disable this controls since it doesn't work as expected */ |
1961 | /* AC97_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 13, 1, 0), */ | 1961 | /* AC97_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 13, 1, 0), */ |
@@ -2098,12 +2098,12 @@ static int alc655_iec958_route_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_ | |||
2098 | } | 2098 | } |
2099 | 2099 | ||
2100 | static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc655[] = { | 2100 | static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc655[] = { |
2101 | AC97_PAGE_SINGLE("IEC958 Capture Switch", AC97_ALC650_MULTICH, 11, 1, 0, 0), | 2101 | AC97_PAGE_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_ALC650_MULTICH, 11, 1, 0, 0), |
2102 | /* disable this controls since it doesn't work as expected */ | 2102 | /* disable this controls since it doesn't work as expected */ |
2103 | /* AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0), */ | 2103 | /* AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0), */ |
2104 | { | 2104 | { |
2105 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 2105 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
2106 | .name = "IEC958 Playback Route", | 2106 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route", |
2107 | .info = alc655_iec958_route_info, | 2107 | .info = alc655_iec958_route_info, |
2108 | .get = alc655_iec958_route_get, | 2108 | .get = alc655_iec958_route_get, |
2109 | .put = alc655_iec958_route_put, | 2109 | .put = alc655_iec958_route_put, |
@@ -2682,7 +2682,7 @@ static const snd_kcontrol_new_t snd_ac97_controls_it2646[] = { | |||
2682 | }; | 2682 | }; |
2683 | 2683 | ||
2684 | static const snd_kcontrol_new_t snd_ac97_spdif_controls_it2646[] = { | 2684 | static const snd_kcontrol_new_t snd_ac97_spdif_controls_it2646[] = { |
2685 | AC97_SINGLE("IEC958 Capture Switch", 0x76, 11, 1, 0), | 2685 | AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0x76, 11, 1, 0), |
2686 | AC97_SINGLE("Analog to IEC958 Output", 0x76, 12, 1, 0), | 2686 | AC97_SINGLE("Analog to IEC958 Output", 0x76, 12, 1, 0), |
2687 | AC97_SINGLE("IEC958 Input Monitor", 0x76, 13, 1, 0), | 2687 | AC97_SINGLE("IEC958 Input Monitor", 0x76, 13, 1, 0), |
2688 | }; | 2688 | }; |