Commit 3b22371e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/jack', 'asoc/fix/max98088',... 

Merge remote-tracking branches 'asoc/fix/jack', 'asoc/fix/max98088', 'asoc/fix/max98095', 'asoc/fix/omap', 'asoc/fix/pxa' and 'asoc/fix/qcom-be' into asoc-linus
parents 92e9f773 f4833a51 9af39044 58c02138 f4d438ee 419396d5 a947b724

include/trace/events/asoc.h

+4 −4
Original line number Diff line number Diff line
@@ -231,13 +231,13 @@ TRACE_EVENT(snd_soc_jack_report, 
	TP_ARGS(jack, mask, val),



	TP_STRUCT__entry(

		__string(	name,		jack->jack->name	)

		__string(	name,		jack->jack->id		)

		__field(	int,		mask			)

		__field(	int,		val			)

	),



	TP_fast_assign(

		__assign_str(name, jack->jack->name);

		__assign_str(name, jack->jack->id);

		__entry->mask = mask;

		__entry->val = val;

	),
@@ -253,12 +253,12 @@ TRACE_EVENT(snd_soc_jack_notify, 
	TP_ARGS(jack, val),



	TP_STRUCT__entry(

		__string(	name,		jack->jack->name	)

		__string(	name,		jack->jack->id		)

		__field(	int,		val			)

	),



	TP_fast_assign(

		__assign_str(name, jack->jack->name);

		__assign_str(name, jack->jack->id);

		__entry->val = val;

	),

sound/soc/codecs/max98088.c

+1 −1
Original line number Diff line number Diff line
@@ -1496,7 +1496,7 @@ static int max98088_put_eq_enum(struct snd_kcontrol *kcontrol, 
       struct max98088_pdata *pdata = max98088->pdata;

       int channel = max98088_get_channel(codec, kcontrol->id.name);

       struct max98088_cdata *cdata;

       int sel = ucontrol->value.integer.value[0];

	int sel = ucontrol->value.enumerated.item[0];



       if (channel < 0)

	       return channel;

sound/soc/codecs/max98095.c

+2 −2
Original line number Diff line number Diff line
@@ -1499,7 +1499,7 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol, 
	struct max98095_pdata *pdata = max98095->pdata;

	int channel = max98095_get_eq_channel(kcontrol->id.name);

	struct max98095_cdata *cdata;

	unsigned int sel = ucontrol->value.integer.value[0];

	unsigned int sel = ucontrol->value.enumerated.item[0];

	struct max98095_eq_cfg *coef_set;

	int fs, best, best_val, i;

	int regmask, regsave;
@@ -1653,7 +1653,7 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol, 
	struct max98095_pdata *pdata = max98095->pdata;

	int channel = max98095_get_bq_channel(codec, kcontrol->id.name);

	struct max98095_cdata *cdata;

	unsigned int sel = ucontrol->value.integer.value[0];

	unsigned int sel = ucontrol->value.enumerated.item[0];

	struct max98095_biquad_cfg *coef_set;

	int fs, best, best_val, i;

	int regmask, regsave;

sound/soc/omap/n810.c

+9 −9
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static struct snd_soc_ops n810_ops = { 
static int n810_get_spk(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_value *ucontrol)

{

	ucontrol->value.integer.value[0] = n810_spk_func;

	ucontrol->value.enumerated.item[0] = n810_spk_func;



	return 0;

}
@@ -143,10 +143,10 @@ static int n810_set_spk(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_card *card =  snd_kcontrol_chip(kcontrol);



	if (n810_spk_func == ucontrol->value.integer.value[0])

	if (n810_spk_func == ucontrol->value.enumerated.item[0])

		return 0;



	n810_spk_func = ucontrol->value.integer.value[0];

	n810_spk_func = ucontrol->value.enumerated.item[0];

	n810_ext_control(&card->dapm);



	return 1;
@@ -155,7 +155,7 @@ static int n810_set_spk(struct snd_kcontrol *kcontrol, 
static int n810_get_jack(struct snd_kcontrol *kcontrol,

			 struct snd_ctl_elem_value *ucontrol)

{

	ucontrol->value.integer.value[0] = n810_jack_func;

	ucontrol->value.enumerated.item[0] = n810_jack_func;



	return 0;

}
@@ -165,10 +165,10 @@ static int n810_set_jack(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_card *card =  snd_kcontrol_chip(kcontrol);



	if (n810_jack_func == ucontrol->value.integer.value[0])

	if (n810_jack_func == ucontrol->value.enumerated.item[0])

		return 0;



	n810_jack_func = ucontrol->value.integer.value[0];

	n810_jack_func = ucontrol->value.enumerated.item[0];

	n810_ext_control(&card->dapm);



	return 1;
@@ -177,7 +177,7 @@ static int n810_set_jack(struct snd_kcontrol *kcontrol, 
static int n810_get_input(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_value *ucontrol)

{

	ucontrol->value.integer.value[0] = n810_dmic_func;

	ucontrol->value.enumerated.item[0] = n810_dmic_func;



	return 0;

}
@@ -187,10 +187,10 @@ static int n810_set_input(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_card *card =  snd_kcontrol_chip(kcontrol);



	if (n810_dmic_func == ucontrol->value.integer.value[0])

	if (n810_dmic_func == ucontrol->value.enumerated.item[0])

		return 0;



	n810_dmic_func = ucontrol->value.integer.value[0];

	n810_dmic_func = ucontrol->value.enumerated.item[0];

	n810_ext_control(&card->dapm);



	return 1;

sound/soc/omap/rx51.c

+9 −9
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static struct snd_soc_ops rx51_ops = { 
static int rx51_get_spk(struct snd_kcontrol *kcontrol,

			struct snd_ctl_elem_value *ucontrol)

{

	ucontrol->value.integer.value[0] = rx51_spk_func;

	ucontrol->value.enumerated.item[0] = rx51_spk_func;



	return 0;

}
@@ -142,10 +142,10 @@ static int rx51_set_spk(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);



	if (rx51_spk_func == ucontrol->value.integer.value[0])

	if (rx51_spk_func == ucontrol->value.enumerated.item[0])

		return 0;



	rx51_spk_func = ucontrol->value.integer.value[0];

	rx51_spk_func = ucontrol->value.enumerated.item[0];

	rx51_ext_control(&card->dapm);



	return 1;
@@ -180,7 +180,7 @@ static int rx51_hp_event(struct snd_soc_dapm_widget *w, 
static int rx51_get_input(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_value *ucontrol)

{

	ucontrol->value.integer.value[0] = rx51_dmic_func;

	ucontrol->value.enumerated.item[0] = rx51_dmic_func;



	return 0;

}
@@ -190,10 +190,10 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);



	if (rx51_dmic_func == ucontrol->value.integer.value[0])

	if (rx51_dmic_func == ucontrol->value.enumerated.item[0])

		return 0;



	rx51_dmic_func = ucontrol->value.integer.value[0];

	rx51_dmic_func = ucontrol->value.enumerated.item[0];

	rx51_ext_control(&card->dapm);



	return 1;
@@ -202,7 +202,7 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol, 
static int rx51_get_jack(struct snd_kcontrol *kcontrol,

			 struct snd_ctl_elem_value *ucontrol)

{

	ucontrol->value.integer.value[0] = rx51_jack_func;

	ucontrol->value.enumerated.item[0] = rx51_jack_func;



	return 0;

}
@@ -212,10 +212,10 @@ static int rx51_set_jack(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);



	if (rx51_jack_func == ucontrol->value.integer.value[0])

	if (rx51_jack_func == ucontrol->value.enumerated.item[0])

		return 0;



	rx51_jack_func = ucontrol->value.integer.value[0];

	rx51_jack_func = ucontrol->value.enumerated.item[0];

	rx51_ext_control(&card->dapm);



	return 1;