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

[ALSA] Remove xxx_t typedefs: HD-Audio codec 



Modules: HDA Codec driver,HDA generic driver

Remove xxx_t typedefs from the HD-Audio codec support codes.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 66f8df6b

sound/pci/hda/hda_codec.c

+45 −45
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int snd_hda_bus_free(struct hda_bus *bus) 
	return 0;

}



static int snd_hda_bus_dev_free(snd_device_t *device)

static int snd_hda_bus_dev_free(struct snd_device *device)

{

	struct hda_bus *bus = device->device_data;

	return snd_hda_bus_free(bus);
@@ -346,12 +346,12 @@ static int snd_hda_bus_dev_free(snd_device_t *device) 
 *

 * Returns 0 if successful, or a negative error code.

 */

int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp,

int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,

		    struct hda_bus **busp)

{

	struct hda_bus *bus;

	int err;

	static snd_device_ops_t dev_ops = {

	static struct snd_device_ops dev_ops = {

		.dev_free = snd_hda_bus_dev_free,

	};
@@ -732,7 +732,7 @@ static int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int 
#define get_amp_index(kc)	(((kc)->private_value >> 19) & 0xf)



/* volume */

int snd_hda_mixer_amp_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)

int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	u16 nid = get_amp_nid(kcontrol);
@@ -753,7 +753,7 @@ int snd_hda_mixer_amp_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t 
	return 0;

}



int snd_hda_mixer_amp_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	hda_nid_t nid = get_amp_nid(kcontrol);
@@ -769,7 +769,7 @@ int snd_hda_mixer_amp_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
	return 0;

}



int snd_hda_mixer_amp_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	hda_nid_t nid = get_amp_nid(kcontrol);
@@ -791,7 +791,7 @@ int snd_hda_mixer_amp_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
}



/* switch */

int snd_hda_mixer_amp_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)

int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	int chs = get_amp_channels(kcontrol);
@@ -802,7 +802,7 @@ int snd_hda_mixer_amp_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t 
	return 0;

}



int snd_hda_mixer_amp_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	hda_nid_t nid = get_amp_nid(kcontrol);
@@ -818,7 +818,7 @@ int snd_hda_mixer_amp_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
	return 0;

}



int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	hda_nid_t nid = get_amp_nid(kcontrol);
@@ -849,7 +849,7 @@ int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
#define AMP_VAL_IDX_SHIFT	19

#define AMP_VAL_IDX_MASK	(0x0f<<19)



int snd_hda_mixer_bind_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	unsigned long pval;
@@ -864,7 +864,7 @@ int snd_hda_mixer_bind_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
	return err;

}



int snd_hda_mixer_bind_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	unsigned long pval;
@@ -889,14 +889,14 @@ int snd_hda_mixer_bind_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
 * SPDIF out controls

 */



static int snd_hda_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)

static int snd_hda_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;

	uinfo->count = 1;

	return 0;

}



static int snd_hda_spdif_cmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |

					   IEC958_AES0_NONAUDIO |
@@ -907,7 +907,7 @@ static int snd_hda_spdif_cmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_ 
	return 0;

}



static int snd_hda_spdif_pmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |

					   IEC958_AES0_NONAUDIO |
@@ -915,7 +915,7 @@ static int snd_hda_spdif_pmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_ 
	return 0;

}



static int snd_hda_spdif_default_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_default_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -978,7 +978,7 @@ static unsigned int convert_to_spdif_status(unsigned short val) 
	return sbits;

}



static int snd_hda_spdif_default_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	hda_nid_t nid = kcontrol->private_value;
@@ -1004,7 +1004,7 @@ static int snd_hda_spdif_default_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_valu 
	return change;

}



static int snd_hda_spdif_out_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)

static int snd_hda_spdif_out_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	uinfo->count = 1;
@@ -1013,7 +1013,7 @@ static int snd_hda_spdif_out_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_ 
	return 0;

}



static int snd_hda_spdif_out_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_out_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -1021,7 +1021,7 @@ static int snd_hda_spdif_out_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_v 
	return 0;

}



static int snd_hda_spdif_out_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	hda_nid_t nid = kcontrol->private_value;
@@ -1044,7 +1044,7 @@ static int snd_hda_spdif_out_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_v 
	return change;

}



static snd_kcontrol_new_t dig_mixes[] = {

static struct snd_kcontrol_new dig_mixes[] = {

	{

		.access = SNDRV_CTL_ELEM_ACCESS_READ,

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1089,8 +1089,8 @@ static snd_kcontrol_new_t dig_mixes[] = { 
int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid)

{

	int err;

	snd_kcontrol_t *kctl;

	snd_kcontrol_new_t *dig_mix;

	struct snd_kcontrol *kctl;

	struct snd_kcontrol_new *dig_mix;



	for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {

		kctl = snd_ctl_new1(dig_mix, codec);
@@ -1109,7 +1109,7 @@ int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid) 


#define snd_hda_spdif_in_switch_info	snd_hda_spdif_out_switch_info



static int snd_hda_spdif_in_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_in_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -1117,7 +1117,7 @@ static int snd_hda_spdif_in_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va 
	return 0;

}



static int snd_hda_spdif_in_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	hda_nid_t nid = kcontrol->private_value;
@@ -1134,7 +1134,7 @@ static int snd_hda_spdif_in_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va 
	return change;

}



static int snd_hda_spdif_in_status_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	hda_nid_t nid = kcontrol->private_value;
@@ -1150,7 +1150,7 @@ static int snd_hda_spdif_in_status_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_va 
	return 0;

}



static snd_kcontrol_new_t dig_in_ctls[] = {

static struct snd_kcontrol_new dig_in_ctls[] = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
@@ -1181,8 +1181,8 @@ static snd_kcontrol_new_t dig_in_ctls[] = { 
int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)

{

	int err;

	snd_kcontrol_t *kctl;

	snd_kcontrol_new_t *dig_mix;

	struct snd_kcontrol *kctl;

	struct snd_kcontrol_new *dig_mix;



	for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) {

		kctl = snd_ctl_new1(dig_mix, codec);
@@ -1498,7 +1498,7 @@ int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid, 
 */

static int hda_pcm_default_open_close(struct hda_pcm_stream *hinfo,

				      struct hda_codec *codec,

				      snd_pcm_substream_t *substream)

				      struct snd_pcm_substream *substream)

{

	return 0;

}
@@ -1507,7 +1507,7 @@ static int hda_pcm_default_prepare(struct hda_pcm_stream *hinfo, 
				   struct hda_codec *codec,

				   unsigned int stream_tag,

				   unsigned int format,

				   snd_pcm_substream_t *substream)

				   struct snd_pcm_substream *substream)

{

	snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);

	return 0;
@@ -1515,7 +1515,7 @@ static int hda_pcm_default_prepare(struct hda_pcm_stream *hinfo, 


static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo,

				   struct hda_codec *codec,

				   snd_pcm_substream_t *substream)

				   struct snd_pcm_substream *substream)

{

	snd_hda_codec_setup_stream(codec, hinfo->nid, 0, 0, 0);

	return 0;
@@ -1646,14 +1646,14 @@ int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_c 
/**

 * snd_hda_add_new_ctls - create controls from the array

 * @codec: the HDA codec

 * @knew: the array of snd_kcontrol_new_t

 * @knew: the array of struct snd_kcontrol_new

 *

 * This helper function creates and add new controls in the given array.

 * The array must be terminated with an empty entry as terminator.

 *

 * Returns 0 if successful, or a negative error code.

 */

int snd_hda_add_new_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew)

int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)

{

	int err;
@@ -1669,7 +1669,7 @@ int snd_hda_add_new_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew) 
/*

 * Channel mode helper

 */

int snd_hda_ch_mode_info(struct hda_codec *codec, snd_ctl_elem_info_t *uinfo,

int snd_hda_ch_mode_info(struct hda_codec *codec, struct snd_ctl_elem_info *uinfo,

			 const struct hda_channel_mode *chmode, int num_chmodes)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -1682,7 +1682,7 @@ int snd_hda_ch_mode_info(struct hda_codec *codec, snd_ctl_elem_info_t *uinfo, 
	return 0;

}



int snd_hda_ch_mode_get(struct hda_codec *codec, snd_ctl_elem_value_t *ucontrol,

int snd_hda_ch_mode_get(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,

			const struct hda_channel_mode *chmode, int num_chmodes,

			int max_channels)

{
@@ -1697,7 +1697,7 @@ int snd_hda_ch_mode_get(struct hda_codec *codec, snd_ctl_elem_value_t *ucontrol, 
	return 0;

}



int snd_hda_ch_mode_put(struct hda_codec *codec, snd_ctl_elem_value_t *ucontrol,

int snd_hda_ch_mode_put(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,

			const struct hda_channel_mode *chmode, int num_chmodes,

			int *max_channelsp)

{
@@ -1717,7 +1717,7 @@ int snd_hda_ch_mode_put(struct hda_codec *codec, snd_ctl_elem_value_t *ucontrol, 
/*

 * input MUX helper

 */

int snd_hda_input_mux_info(const struct hda_input_mux *imux, snd_ctl_elem_info_t *uinfo)

int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem_info *uinfo)

{

	unsigned int index;
@@ -1732,7 +1732,7 @@ int snd_hda_input_mux_info(const struct hda_input_mux *imux, snd_ctl_elem_info_t 
}



int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux,

			  snd_ctl_elem_value_t *ucontrol, hda_nid_t nid,

			  struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,

			  unsigned int *cur_val)

{

	unsigned int idx;
@@ -1783,7 +1783,7 @@ int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *m 
 * set up more restrictions for analog out

 */

int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout,

				  snd_pcm_substream_t *substream)

				  struct snd_pcm_substream *substream)

{

	substream->runtime->hw.channels_max = mout->max_channels;

	return snd_pcm_hw_constraint_step(substream->runtime, 0,
@@ -1797,7 +1797,7 @@ int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out 
int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_out *mout,

				     unsigned int stream_tag,

				     unsigned int format,

				     snd_pcm_substream_t *substream)

				     struct snd_pcm_substream *substream)

{

	hda_nid_t *nids = mout->dac_nids;

	int chs = substream->runtime->channels;
@@ -2019,15 +2019,15 @@ int snd_hda_resume(struct hda_bus *bus) 
/**

 * snd_hda_resume_ctls - resume controls in the new control list

 * @codec: the HDA codec

 * @knew: the array of snd_kcontrol_new_t

 * @knew: the array of struct snd_kcontrol_new

 *

 * This function resumes the mixer controls in the snd_kcontrol_new_t array,

 * This function resumes the mixer controls in the struct snd_kcontrol_new array,

 * originally for snd_hda_add_new_ctls().

 * The array must be terminated with an empty entry as terminator.

 */

int snd_hda_resume_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew)

int snd_hda_resume_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)

{

	snd_ctl_elem_value_t *val;

	struct snd_ctl_elem_value *val;



	val = kmalloc(sizeof(*val), GFP_KERNEL);

	if (! val)

sound/pci/hda/hda_codec.h

+7 −7
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ struct hda_bus_template { 
 * A hda_bus contains several codecs in the list codec_list.

 */

struct hda_bus {

	snd_card_t *card;

	struct snd_card *card;



	/* copied from template */

	void *private_data;
@@ -437,7 +437,7 @@ struct hda_bus { 
	/* unsolicited event queue */

	struct hda_bus_unsolicited *unsol;



	snd_info_entry_t *proc;

	struct snd_info_entry *proc;

};



/*
@@ -481,14 +481,14 @@ struct hda_amp_info { 
/* PCM callbacks */

struct hda_pcm_ops {

	int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec,

		    snd_pcm_substream_t *substream);

		    struct snd_pcm_substream *substream);

	int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec,

		     snd_pcm_substream_t *substream);

		     struct snd_pcm_substream *substream);

	int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec,

		       unsigned int stream_tag, unsigned int format,

		       snd_pcm_substream_t *substream);

		       struct snd_pcm_substream *substream);

	int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,

		       snd_pcm_substream_t *substream);

		       struct snd_pcm_substream *substream);

};



/* PCM information for each substream */
@@ -563,7 +563,7 @@ enum { 
/*

 * constructors

 */

int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp,

int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,

		    struct hda_bus **busp);

int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,

		      struct hda_codec **codecp);

sound/pci/hda/hda_generic.c

+10 −10
Original line number Diff line number Diff line
@@ -389,14 +389,14 @@ static int parse_output(struct hda_codec *codec) 
 */



/* control callbacks */

static int capture_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)

static int capture_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct hda_gspec *spec = codec->spec;

	return snd_hda_input_mux_info(&spec->input_mux, uinfo);

}



static int capture_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int capture_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct hda_gspec *spec = codec->spec;
@@ -405,7 +405,7 @@ static int capture_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uc 
	return 0;

}



static int capture_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)

static int capture_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct hda_gspec *spec = codec->spec;
@@ -617,7 +617,7 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node, 
	char name[32];

	int err;

	int created = 0;

	snd_kcontrol_new_t knew;

	struct snd_kcontrol_new knew;



	if (type)

		sprintf(name, "%s %s Switch", type, dir_sfx);
@@ -625,14 +625,14 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node, 
		sprintf(name, "%s Switch", dir_sfx);

	if ((node->wid_caps & AC_WCAP_IN_AMP) &&

	    (node->amp_in_caps & AC_AMPCAP_MUTE)) {

		knew = (snd_kcontrol_new_t)HDA_CODEC_MUTE(name, node->nid, index, HDA_INPUT);

		knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, index, HDA_INPUT);

		snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);

		if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)

			return err;

		created = 1;

	} else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&

		   (node->amp_out_caps & AC_AMPCAP_MUTE)) {

		knew = (snd_kcontrol_new_t)HDA_CODEC_MUTE(name, node->nid, 0, HDA_OUTPUT);

		knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, 0, HDA_OUTPUT);

		snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);

		if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)

			return err;
@@ -645,14 +645,14 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node, 
		sprintf(name, "%s Volume", dir_sfx);

	if ((node->wid_caps & AC_WCAP_IN_AMP) &&

	    (node->amp_in_caps & AC_AMPCAP_NUM_STEPS)) {

		knew = (snd_kcontrol_new_t)HDA_CODEC_VOLUME(name, node->nid, index, HDA_INPUT);

		knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, index, HDA_INPUT);

		snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);

		if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)

			return err;

		created = 1;

	} else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&

		   (node->amp_out_caps & AC_AMPCAP_NUM_STEPS)) {

		knew = (snd_kcontrol_new_t)HDA_CODEC_VOLUME(name, node->nid, 0, HDA_OUTPUT);

		knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, 0, HDA_OUTPUT);

		snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);

		if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)

			return err;
@@ -667,7 +667,7 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node, 
 */

static int check_existing_control(struct hda_codec *codec, const char *type, const char *dir)

{

	snd_ctl_elem_id_t id;

	struct snd_ctl_elem_id id;

	memset(&id, 0, sizeof(id));

	sprintf(id.name, "%s %s Volume", type, dir);

	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -710,7 +710,7 @@ static int build_input_controls(struct hda_codec *codec) 


	/* create input MUX if multiple sources are available */

	if (spec->input_mux.num_items > 1) {

		static snd_kcontrol_new_t cap_sel = {

		static struct snd_kcontrol_new cap_sel = {

			.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

			.name = "Capture Source",

			.info = capture_source_info,

sound/pci/hda/hda_local.h

+18 −18
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ 
#define HDA_CODEC_MUTE(xname, nid, xindex, direction) \

	HDA_CODEC_MUTE_MONO(xname, nid, 3, xindex, direction)



int snd_hda_mixer_amp_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo);

int snd_hda_mixer_amp_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);

int snd_hda_mixer_amp_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);

int snd_hda_mixer_amp_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo);

int snd_hda_mixer_amp_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);

int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);

int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);

int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);

int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);



/* mono switch binding multiple inputs */

#define HDA_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \
@@ -78,8 +78,8 @@ int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t 
/* stereo switch binding multiple inputs */

#define HDA_BIND_MUTE(xname,nid,indices,dir) HDA_BIND_MUTE_MONO(xname,nid,3,indices,dir)



int snd_hda_mixer_bind_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);

int snd_hda_mixer_bind_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);

int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);



int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid);

int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid);
@@ -97,9 +97,9 @@ struct hda_input_mux { 
	struct hda_input_mux_item items[HDA_MAX_NUM_INPUTS];

};



int snd_hda_input_mux_info(const struct hda_input_mux *imux, snd_ctl_elem_info_t *uinfo);

int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem_info *uinfo);

int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux,

			  snd_ctl_elem_value_t *ucontrol, hda_nid_t nid,

			  struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,

			  unsigned int *cur_val);



/*
@@ -110,12 +110,12 @@ struct hda_channel_mode { 
	const struct hda_verb *sequence;

};



int snd_hda_ch_mode_info(struct hda_codec *codec, snd_ctl_elem_info_t *uinfo,

int snd_hda_ch_mode_info(struct hda_codec *codec, struct snd_ctl_elem_info *uinfo,

			 const struct hda_channel_mode *chmode, int num_chmodes);

int snd_hda_ch_mode_get(struct hda_codec *codec, snd_ctl_elem_value_t *ucontrol,

int snd_hda_ch_mode_get(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,

			const struct hda_channel_mode *chmode, int num_chmodes,

			int max_channels);

int snd_hda_ch_mode_put(struct hda_codec *codec, snd_ctl_elem_value_t *ucontrol,

int snd_hda_ch_mode_put(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,

			const struct hda_channel_mode *chmode, int num_chmodes,

			int *max_channelsp);
@@ -138,11 +138,11 @@ struct hda_multi_out { 
int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout);

int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *mout);

int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout,

				  snd_pcm_substream_t *substream);

				  struct snd_pcm_substream *substream);

int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_out *mout,

				     unsigned int stream_tag,

				     unsigned int format,

				     snd_pcm_substream_t *substream);

				     struct snd_pcm_substream *substream);

int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_out *mout);



/*
@@ -170,13 +170,13 @@ struct hda_board_config { 
};



int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_config *tbl);

int snd_hda_add_new_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew);

int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew);



/*

 * power management

 */

#ifdef CONFIG_PM

int snd_hda_resume_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew);

int snd_hda_resume_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew);

int snd_hda_resume_spdif_out(struct hda_codec *codec);

int snd_hda_resume_spdif_in(struct hda_codec *codec);

#endif

sound/pci/hda/hda_proc.c

+6 −6
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static const char *get_wid_type_name(unsigned int wid_value) 
		return "UNKOWN Widget";

}



static void print_amp_caps(snd_info_buffer_t *buffer,

static void print_amp_caps(struct snd_info_buffer *buffer,

			   struct hda_codec *codec, hda_nid_t nid, int dir)

{

	unsigned int caps;
@@ -66,7 +66,7 @@ static void print_amp_caps(snd_info_buffer_t *buffer, 
		    (caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT);

}



static void print_amp_vals(snd_info_buffer_t *buffer,

static void print_amp_vals(struct snd_info_buffer *buffer,

			   struct hda_codec *codec, hda_nid_t nid,

			   int dir, int stereo, int indices)

{
@@ -91,7 +91,7 @@ static void print_amp_vals(snd_info_buffer_t *buffer, 
	snd_iprintf(buffer, "\n");

}



static void print_pcm_caps(snd_info_buffer_t *buffer,

static void print_pcm_caps(struct snd_info_buffer *buffer,

			   struct hda_codec *codec, hda_nid_t nid)

{

	unsigned int pcm = snd_hda_param_read(codec, nid, AC_PAR_PCM);
@@ -160,7 +160,7 @@ static const char *get_jack_color(u32 cfg) 
		return "UNKNOWN";

}



static void print_pin_caps(snd_info_buffer_t *buffer,

static void print_pin_caps(struct snd_info_buffer *buffer,

			   struct hda_codec *codec, hda_nid_t nid)

{

	static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" };
@@ -194,7 +194,7 @@ static void print_pin_caps(snd_info_buffer_t *buffer, 
}





static void print_codec_info(snd_info_entry_t *entry, snd_info_buffer_t *buffer)

static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffer *buffer)

{

	struct hda_codec *codec = entry->private_data;

	char buf[32];
@@ -309,7 +309,7 @@ static void print_codec_info(snd_info_entry_t *entry, snd_info_buffer_t *buffer) 
int snd_hda_codec_proc_new(struct hda_codec *codec)

{

	char name[32];

	snd_info_entry_t *entry;

	struct snd_info_entry *entry;

	int err;



	snprintf(name, sizeof(name), "codec#%d", codec->addr);