Commit a5ce8890 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent b9ed4f2b

include/sound/soc.h

+1 −2
Original line number Diff line number Diff line
@@ -201,8 +201,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_bool_ext(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

#define snd_soc_info_bool_ext		snd_ctl_boolean_mono

int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,

sound/aoa/codecs/snd-aoa-codec-onyx.c

+2 −18
Original line number Diff line number Diff line
@@ -297,15 +297,7 @@ static struct snd_kcontrol_new capture_source_control = { 
	.put = onyx_snd_capture_source_put,

};



static int onyx_snd_mute_info(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	uinfo->count = 2;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = 1;

	return 0;

}

#define onyx_snd_mute_info	snd_ctl_boolean_stereo_info



static int onyx_snd_mute_get(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)
@@ -359,15 +351,7 @@ static struct snd_kcontrol_new mute_control = { 
};





static int onyx_snd_single_bit_info(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	uinfo->count = 1;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = 1;

	return 0;

}

#define onyx_snd_single_bit_info	snd_ctl_boolean_mono_info



#define FLAG_POLARITY_INVERT	1

#define FLAG_SPDIFLOCK		2

sound/aoa/codecs/snd-aoa-codec-tas.c

+2 −18
Original line number Diff line number Diff line
@@ -272,15 +272,7 @@ static struct snd_kcontrol_new volume_control = { 
	.put = tas_snd_vol_put,

};



static int tas_snd_mute_info(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	uinfo->count = 2;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = 1;

	return 0;

}

#define tas_snd_mute_info	snd_ctl_boolean_stereo_info



static int tas_snd_mute_get(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)
@@ -431,15 +423,7 @@ static struct snd_kcontrol_new drc_range_control = { 
	.put = tas_snd_drc_range_put,

};



static int tas_snd_drc_switch_info(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	uinfo->count = 1;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = 1;

	return 0;

}

#define tas_snd_drc_switch_info		snd_ctl_boolean_mono_info



static int tas_snd_drc_switch_get(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

sound/aoa/fabrics/snd-aoa-fabric-layout.c

+1 −9
Original line number Diff line number Diff line
@@ -582,15 +582,7 @@ static int layouts_list_items; 
 * make the fabric handle all the card stuff, etc... */

static struct layout_dev *layout_device;



static int control_info(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	uinfo->count = 1;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = 1;

	return 0;

}

#define control_info	snd_ctl_boolean_mono_info



#define AMP_CONTROL(n, description)					\

static int n##_control_get(struct snd_kcontrol *kcontrol,		\

sound/drivers/dummy.c

+1 −9
Original line number Diff line number Diff line
@@ -510,15 +510,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_dummy, -4500, 30, 0); 
  .get = snd_dummy_capsrc_get, .put = snd_dummy_capsrc_put, \

  .private_value = addr }



static int snd_dummy_capsrc_info(struct snd_kcontrol *kcontrol,

				 struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	uinfo->count = 2;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = 1;

	return 0;

}

#define snd_dummy_capsrc_info	snd_ctl_boolean_stereo_info

 

static int snd_dummy_capsrc_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)