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

Commit 26d9ca34 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Let snd_soc_limit_volume() take a snd_soc_card 



snd_soc_limit_volume() operates on a card and the CODEC that is passed in
is only used to look up the card. Let it directly take the card instead.
This makes it possible to use it when no snd_soc_codec is available.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6ff33f39

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_limit_volume(struct snd_soc_codec *codec,

int snd_soc_limit_volume(struct snd_soc_card *card,

	const char *name, int max);

int snd_soc_bytes_info(struct snd_kcontrol *kcontrol,

		       struct snd_ctl_elem_info *uinfo);

sound/soc/omap/rx51.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) 
		dev_err(card->dev, "Failed to add TPA6130A2 controls\n");

		return err;

	}

	snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);

	snd_soc_limit_volume(card, "TPA6130A2 Headphone Playback Volume", 42);



	err = omap_mcbsp_st_add_controls(rtd, 2);

	if (err < 0) {

sound/soc/soc-ops.c

+4 −4
Original line number Diff line number Diff line
@@ -560,16 +560,16 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range); 
/**

 * snd_soc_limit_volume - Set new limit to an existing volume control.

 *

 * @codec: where to look for the control

 * @card: where to look for the control

 * @name: Name of the control

 * @max: new maximum limit

 *

 * Return 0 for success, else error.

 */

int snd_soc_limit_volume(struct snd_soc_codec *codec,

int snd_soc_limit_volume(struct snd_soc_card *card,

	const char *name, int max)

{

	struct snd_card *card = codec->component.card->snd_card;

	struct snd_card *snd_card = card->snd_card;

	struct snd_kcontrol *kctl;

	struct soc_mixer_control *mc;

	int found = 0;
@@ -579,7 +579,7 @@ int snd_soc_limit_volume(struct snd_soc_codec *codec, 
	if (unlikely(!name || max <= 0))

		return -EINVAL;



	list_for_each_entry(kctl, &card->controls, list) {

	list_for_each_entry(kctl, &snd_card->controls, list) {

		if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name))) {

			found = 1;

			break;