Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b0c474f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Use own workqueue
  ALSA: hda - add support for Intel DX58SO board
  ASoC: TWL4030: Module unloading fix
  ALSA: hda - create hda_codec.control_mutex for kcontrol->private_value
  ALSA: caiaq - Version 1.3.10
  ALSA: hda - Add quirk for Dell Inspiron Mini9
  ALSA: caiaq - Fix Oops with MIDI
  ASoC: TWL4030: Change the soc_value_enum back to soc_enum
  ASoC: Merge the soc_value_enum to soc_enum struct
  ALSA: hda - Add quirks for Acer Aspire 5930G and 6930G
  ALSA: hda - Add codec ID for MCP73 HDMI
  ALSA: hda - Fix typos for AD1882 codecs
  ALSA: hda - Add quirk for HP 2230s
parents ae04d140 05f93414

include/sound/soc-dapm.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
  	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_VALUE_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_value_enum_double, \

	.info = snd_soc_info_enum_double, \

	.get = snd_soc_dapm_get_value_enum_double, \

	.put = snd_soc_dapm_put_value_enum_double, \

	.private_value = (unsigned long)&xenum }

include/sound/soc.h

+1 −14
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
	.private_value = (unsigned long)&xenum }

#define SOC_VALUE_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\

	.info = snd_soc_info_value_enum_double, \

	.info = snd_soc_info_enum_double, \

	.get = snd_soc_get_value_enum_double, \

	.put = snd_soc_put_value_enum_double, \

	.private_value = (unsigned long)&xenum }
@@ -211,8 +211,6 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol,
@@ -414,17 +412,6 @@ struct soc_mixer_control { 


/* enumerated kcontrol */

struct soc_enum {

	unsigned short reg;

	unsigned short reg2;

	unsigned char shift_l;

	unsigned char shift_r;

	unsigned int max;

	const char **texts;

	void *dapm;

};



/* semi enumerated kcontrol */

struct soc_value_enum {

	unsigned short reg;

	unsigned short reg2;

	unsigned char shift_l;

sound/pci/hda/hda_beep.c

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ void snd_hda_detach_beep_device(struct hda_codec *codec) 
	struct hda_beep *beep = codec->beep;

	if (beep) {

		cancel_work_sync(&beep->beep_work);

		flush_scheduled_work();



		input_unregister_device(beep->dev);

		kfree(beep);

sound/pci/hda/hda_codec.c

+30 −18
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex) 
	unsol->queue[wp] = res;

	unsol->queue[wp + 1] = res_ex;



	schedule_work(&unsol->work);

	queue_work(bus->workq, &unsol->work);



	return 0;

}
@@ -437,15 +437,17 @@ static int snd_hda_bus_free(struct hda_bus *bus) 


	if (!bus)

		return 0;

	if (bus->unsol) {

		flush_scheduled_work();

	if (bus->workq)

		flush_workqueue(bus->workq);

	if (bus->unsol)

		kfree(bus->unsol);

	}

	list_for_each_entry_safe(codec, n, &bus->codec_list, list) {

		snd_hda_codec_free(codec);

	}

	if (bus->ops.private_free)

		bus->ops.private_free(bus);

	if (bus->workq)

		destroy_workqueue(bus->workq);

	kfree(bus);

	return 0;

}
@@ -485,6 +487,7 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, 
{

	struct hda_bus *bus;

	int err;

	char qname[8];

	static struct snd_device_ops dev_ops = {

		.dev_register = snd_hda_bus_dev_register,

		.dev_free = snd_hda_bus_dev_free,
@@ -514,6 +517,14 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, 
	mutex_init(&bus->cmd_mutex);

	INIT_LIST_HEAD(&bus->codec_list);



	snprintf(qname, sizeof(qname), "hda%d", card->number);

	bus->workq = create_workqueue(qname);

	if (!bus->workq) {

		snd_printk(KERN_ERR "cannot create workqueue %s\n", qname);

		kfree(bus);

		return -ENOMEM;

	}



	err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops);

	if (err < 0) {

		snd_hda_bus_free(bus);
@@ -684,7 +695,7 @@ static void snd_hda_codec_free(struct hda_codec *codec) 
		return;

#ifdef CONFIG_SND_HDA_POWER_SAVE

	cancel_delayed_work(&codec->power_work);

	flush_scheduled_work();

	flush_workqueue(codec->bus->workq);

#endif

	list_del(&codec->list);

	snd_array_free(&codec->mixers);
@@ -735,6 +746,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr 
	codec->bus = bus;

	codec->addr = codec_addr;

	mutex_init(&codec->spdif_mutex);

	mutex_init(&codec->control_mutex);

	init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));

	init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));

	snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32);
@@ -1272,7 +1284,7 @@ void snd_hda_codec_reset(struct hda_codec *codec) 


#ifdef CONFIG_SND_HDA_POWER_SAVE

	cancel_delayed_work(&codec->power_work);

	flush_scheduled_work();

	flush_workqueue(codec->bus->workq);

#endif

	snd_hda_ctls_clear(codec);

	/* relase PCMs */
@@ -1418,12 +1430,12 @@ int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, 
	unsigned long pval;

	int err;



	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */

	mutex_lock(&codec->control_mutex);

	pval = kcontrol->private_value;

	kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */

	err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);

	kcontrol->private_value = pval;

	mutex_unlock(&codec->spdif_mutex);

	mutex_unlock(&codec->control_mutex);

	return err;

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_get);
@@ -1435,7 +1447,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, 
	unsigned long pval;

	int i, indices, err = 0, change = 0;



	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */

	mutex_lock(&codec->control_mutex);

	pval = kcontrol->private_value;

	indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;

	for (i = 0; i < indices; i++) {
@@ -1447,7 +1459,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, 
		change |= err;

	}

	kcontrol->private_value = pval;

	mutex_unlock(&codec->spdif_mutex);

	mutex_unlock(&codec->control_mutex);

	return err < 0 ? err : change;

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_put);
@@ -1462,12 +1474,12 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol, 
	struct hda_bind_ctls *c;

	int err;



	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */

	mutex_lock(&codec->control_mutex);

	c = (struct hda_bind_ctls *)kcontrol->private_value;

	kcontrol->private_value = *c->values;

	err = c->ops->info(kcontrol, uinfo);

	kcontrol->private_value = (long)c;

	mutex_unlock(&codec->spdif_mutex);

	mutex_unlock(&codec->control_mutex);

	return err;

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_info);
@@ -1479,12 +1491,12 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol, 
	struct hda_bind_ctls *c;

	int err;



	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */

	mutex_lock(&codec->control_mutex);

	c = (struct hda_bind_ctls *)kcontrol->private_value;

	kcontrol->private_value = *c->values;

	err = c->ops->get(kcontrol, ucontrol);

	kcontrol->private_value = (long)c;

	mutex_unlock(&codec->spdif_mutex);

	mutex_unlock(&codec->control_mutex);

	return err;

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_get);
@@ -1497,7 +1509,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol, 
	unsigned long *vals;

	int err = 0, change = 0;



	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */

	mutex_lock(&codec->control_mutex);

	c = (struct hda_bind_ctls *)kcontrol->private_value;

	for (vals = c->values; *vals; vals++) {

		kcontrol->private_value = *vals;
@@ -1507,7 +1519,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol, 
		change |= err;

	}

	kcontrol->private_value = (long)c;

	mutex_unlock(&codec->spdif_mutex);

	mutex_unlock(&codec->control_mutex);

	return err < 0 ? err : change;

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_put);
@@ -1519,12 +1531,12 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag, 
	struct hda_bind_ctls *c;

	int err;



	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */

	mutex_lock(&codec->control_mutex);

	c = (struct hda_bind_ctls *)kcontrol->private_value;

	kcontrol->private_value = *c->values;

	err = c->ops->tlv(kcontrol, op_flag, size, tlv);

	kcontrol->private_value = (long)c;

	mutex_unlock(&codec->spdif_mutex);

	mutex_unlock(&codec->control_mutex);

	return err;

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_tlv);

sound/pci/hda/hda_codec.h

+2 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ struct hda_bus { 


	/* unsolicited event queue */

	struct hda_bus_unsolicited *unsol;

	struct workqueue_struct *workq;	/* common workqueue for codecs */



	/* assigned PCMs */

	DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES);
@@ -771,6 +772,7 @@ struct hda_codec { 
	struct hda_cache_rec cmd_cache;	/* cache for other commands */



	struct mutex spdif_mutex;

	struct mutex control_mutex;

	unsigned int spdif_status;	/* IEC958 status bits */

	unsigned short spdif_ctls;	/* SPDIF control bits */

	unsigned int spdif_in_enable;	/* SPDIF input enable? */