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

Commit 91a5fca4 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Add dapm_find_widget helper 



This patch adds a helper function for searching DAPM widgets by name.
This allows to streamline functions which operate on widgets by name.
It also allows to get rid of copy'n'pasted code which was added to fallback to
widgets from other contexts if the widget was not found in the current context.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b864a8c9

sound/soc/soc-dapm.c

+45 −70
Original line number Original line Diff line number Diff line
@@ -1458,42 +1458,45 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) 
	}

	}

}

}





static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm,

static struct snd_soc_dapm_widget *dapm_find_widget(

				const char *pin, int status)

			struct snd_soc_dapm_context *dapm, const char *pin,

			bool search_other_contexts)

{

{

	struct snd_soc_dapm_widget *w;

	struct snd_soc_dapm_widget *w;

	struct snd_soc_dapm_widget *fallback = NULL;





	list_for_each_entry(w, &dapm->card->widgets, list) {

	list_for_each_entry(w, &dapm->card->widgets, list) {

		if (w->dapm != dapm)

			continue;

		if (!strcmp(w->name, pin)) {

		if (!strcmp(w->name, pin)) {

			dev_dbg(w->dapm->dev, "dapm: pin %s = %d\n",

			if (w->dapm == dapm)

				pin, status);

				return w;

			w->connected = status;

			else

			/* Allow disabling of forced pins */

				fallback = w;

			if (status == 0)

				w->force = 0;

			return 0;

		}

		}

	}

	}





	/* Try again in other contexts */

	if (search_other_contexts)

	list_for_each_entry(w, &dapm->card->widgets, list) {

		return fallback;

		if (!strcmp(w->name, pin)) {



			dev_dbg(w->dapm->dev, "dapm: pin %s = %d\n",

	return NULL;

				pin, status);

			w->connected = status;

			/* Allow disabling of forced pins */

			if (status == 0)

				w->force = 0;

			return 0;

		}

}

}





static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm,

				const char *pin, int status)

{

	struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);



	if (!w) {

		dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);

		dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);

		return -EINVAL;

		return -EINVAL;

	}

	}





	w->connected = status;

	if (status == 0)

		w->force = 0;



	return 0;

}



/**

/**

 * snd_soc_dapm_sync - scan and power dapm paths

 * snd_soc_dapm_sync - scan and power dapm paths

 * @dapm: DAPM context

 * @dapm: DAPM context
@@ -2316,33 +2319,18 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin); 
int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,

				  const char *pin)

				  const char *pin)

{

{

	struct snd_soc_dapm_widget *w;

	struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);





	list_for_each_entry(w, &dapm->card->widgets, list) {

	if (!w) {

		if (w->dapm != dapm)

		dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);

			continue;

		return -EINVAL;

		if (!strcmp(w->name, pin)) {

			dev_dbg(w->dapm->dev,

				"dapm: force enable pin %s\n", pin);

			w->connected = 1;

			w->force = 1;

			return 0;

		}

	}

	}





	/* Try again with other contexts */

	dev_dbg(w->dapm->dev, "dapm: force enable pin %s\n", pin);

	list_for_each_entry(w, &dapm->card->widgets, list) {

		if (!strcmp(w->name, pin)) {

			dev_dbg(w->dapm->dev,

				"dapm: force enable pin %s\n", pin);

	w->connected = 1;

	w->connected = 1;

	w->force = 1;

	w->force = 1;

			return 0;

		}

	}





	dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);

	return 0;

	return -EINVAL;

}

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_force_enable_pin);

EXPORT_SYMBOL_GPL(snd_soc_dapm_force_enable_pin);
@@ -2394,20 +2382,10 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_nc_pin); 
int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,

				const char *pin)

				const char *pin)

{

{

	struct snd_soc_dapm_widget *w;

	struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);



	list_for_each_entry(w, &dapm->card->widgets, list) {

		if (w->dapm != dapm)

			continue;

		if (!strcmp(w->name, pin))

			return w->connected;

	}





	/* Try again in other contexts */

	if (w)

	list_for_each_entry(w, &dapm->card->widgets, list) {

		if (!strcmp(w->name, pin))

		return w->connected;

		return w->connected;

	}





	return 0;

	return 0;

}

}
@@ -2427,20 +2405,17 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_status); 
int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

				const char *pin)

				const char *pin)

{

{

	struct snd_soc_dapm_widget *w;

	struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, false);



	list_for_each_entry(w, &dapm->card->widgets, list) {

		if (w->dapm != dapm)

			continue;

		if (!strcmp(w->name, pin)) {

			w->ignore_suspend = 1;

			return 0;

		}

	}





	if (!w) {

		dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);

		dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);

		return -EINVAL;

		return -EINVAL;

	}

	}



	w->ignore_suspend = 1;



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);

EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);





/**

/**