diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-07-23 09:42:26 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 09:57:45 -0400 |
commit | a5ce88909d3007caa7b65996a8f6784350beb2a6 (patch) | |
tree | e9882165ba7f7fe88dd8de817028edefadb0d496 /sound/i2c | |
parent | b9ed4f2b68dc47b0c35c1a3ae8ae97c2517d5177 (diff) |
[ALSA] Clean up with common snd_ctl_boolean_*_info callbacks
Clean up codes using the new common snd_ctl_boolean_*_info() callbacks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/i2c')
-rw-r--r-- | sound/i2c/other/ak4114.c | 10 | ||||
-rw-r--r-- | sound/i2c/other/ak4117.c | 10 | ||||
-rw-r--r-- | sound/i2c/other/ak4xxx-adda.c | 10 | ||||
-rw-r--r-- | sound/i2c/other/pt2258.c | 10 | ||||
-rw-r--r-- | sound/i2c/tea6330t.c | 10 |
5 files changed, 5 insertions, 45 deletions
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c index 1efb973137a6..f2b81e39b8cf 100644 --- a/sound/i2c/other/ak4114.c +++ b/sound/i2c/other/ak4114.c | |||
@@ -200,15 +200,7 @@ static int snd_ak4114_in_error_get(struct snd_kcontrol *kcontrol, | |||
200 | return 0; | 200 | return 0; |
201 | } | 201 | } |
202 | 202 | ||
203 | static int snd_ak4114_in_bit_info(struct snd_kcontrol *kcontrol, | 203 | #define snd_ak4114_in_bit_info snd_ctl_boolean_mono_info |
204 | struct snd_ctl_elem_info *uinfo) | ||
205 | { | ||
206 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | ||
207 | uinfo->count = 1; | ||
208 | uinfo->value.integer.min = 0; | ||
209 | uinfo->value.integer.max = 1; | ||
210 | return 0; | ||
211 | } | ||
212 | 204 | ||
213 | static int snd_ak4114_in_bit_get(struct snd_kcontrol *kcontrol, | 205 | static int snd_ak4114_in_bit_get(struct snd_kcontrol *kcontrol, |
214 | struct snd_ctl_elem_value *ucontrol) | 206 | struct snd_ctl_elem_value *ucontrol) |
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index c022f29da2f7..1614973e4899 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c | |||
@@ -181,15 +181,7 @@ static int snd_ak4117_in_error_get(struct snd_kcontrol *kcontrol, | |||
181 | return 0; | 181 | return 0; |
182 | } | 182 | } |
183 | 183 | ||
184 | static int snd_ak4117_in_bit_info(struct snd_kcontrol *kcontrol, | 184 | #define snd_ak4117_in_bit_info snd_ctl_boolean_mono_info |
185 | struct snd_ctl_elem_info *uinfo) | ||
186 | { | ||
187 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | ||
188 | uinfo->count = 1; | ||
189 | uinfo->value.integer.min = 0; | ||
190 | uinfo->value.integer.max = 1; | ||
191 | return 0; | ||
192 | } | ||
193 | 185 | ||
194 | static int snd_ak4117_in_bit_get(struct snd_kcontrol *kcontrol, | 186 | static int snd_ak4117_in_bit_get(struct snd_kcontrol *kcontrol, |
195 | struct snd_ctl_elem_value *ucontrol) | 187 | struct snd_ctl_elem_value *ucontrol) |
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index fd335159f849..0fa107289527 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c | |||
@@ -463,15 +463,7 @@ static int snd_akm4xxx_deemphasis_put(struct snd_kcontrol *kcontrol, | |||
463 | return change; | 463 | return change; |
464 | } | 464 | } |
465 | 465 | ||
466 | static int ak4xxx_switch_info(struct snd_kcontrol *kcontrol, | 466 | #define ak4xxx_switch_info snd_ctl_boolean_mono_info |
467 | struct snd_ctl_elem_info *uinfo) | ||
468 | { | ||
469 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | ||
470 | uinfo->count = 1; | ||
471 | uinfo->value.integer.min = 0; | ||
472 | uinfo->value.integer.max = 1; | ||
473 | return 0; | ||
474 | } | ||
475 | 467 | ||
476 | static int ak4xxx_switch_get(struct snd_kcontrol *kcontrol, | 468 | static int ak4xxx_switch_get(struct snd_kcontrol *kcontrol, |
477 | struct snd_ctl_elem_value *ucontrol) | 469 | struct snd_ctl_elem_value *ucontrol) |
diff --git a/sound/i2c/other/pt2258.c b/sound/i2c/other/pt2258.c index e91cc3b44de5..00c83d8b32b1 100644 --- a/sound/i2c/other/pt2258.c +++ b/sound/i2c/other/pt2258.c | |||
@@ -140,15 +140,7 @@ static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol, | |||
140 | return -EIO; | 140 | return -EIO; |
141 | } | 141 | } |
142 | 142 | ||
143 | static int pt2258_switch_info(struct snd_kcontrol *kcontrol, | 143 | #define pt2258_switch_info snd_ctl_boolean_mono_info |
144 | struct snd_ctl_elem_info *uinfo) | ||
145 | { | ||
146 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | ||
147 | uinfo->count = 1; | ||
148 | uinfo->value.integer.min = 0; | ||
149 | uinfo->value.integer.max = 1; | ||
150 | return 0; | ||
151 | } | ||
152 | 144 | ||
153 | static int pt2258_switch_get(struct snd_kcontrol *kcontrol, | 145 | static int pt2258_switch_get(struct snd_kcontrol *kcontrol, |
154 | struct snd_ctl_elem_value *ucontrol) | 146 | struct snd_ctl_elem_value *ucontrol) |
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c index ae5b1e3a68ce..21ff97405c41 100644 --- a/sound/i2c/tea6330t.c +++ b/sound/i2c/tea6330t.c | |||
@@ -142,15 +142,7 @@ static int snd_tea6330t_put_master_volume(struct snd_kcontrol *kcontrol, | |||
142 | .info = snd_tea6330t_info_master_switch, \ | 142 | .info = snd_tea6330t_info_master_switch, \ |
143 | .get = snd_tea6330t_get_master_switch, .put = snd_tea6330t_put_master_switch } | 143 | .get = snd_tea6330t_get_master_switch, .put = snd_tea6330t_put_master_switch } |
144 | 144 | ||
145 | static int snd_tea6330t_info_master_switch(struct snd_kcontrol *kcontrol, | 145 | #define snd_tea6330t_info_master_switch snd_ctl_boolean_stereo_info |
146 | struct snd_ctl_elem_info *uinfo) | ||
147 | { | ||
148 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | ||
149 | uinfo->count = 2; | ||
150 | uinfo->value.integer.min = 0; | ||
151 | uinfo->value.integer.max = 1; | ||
152 | return 0; | ||
153 | } | ||
154 | 146 | ||
155 | static int snd_tea6330t_get_master_switch(struct snd_kcontrol *kcontrol, | 147 | static int snd_tea6330t_get_master_switch(struct snd_kcontrol *kcontrol, |
156 | struct snd_ctl_elem_value *ucontrol) | 148 | struct snd_ctl_elem_value *ucontrol) |