ASoC: soc-dapm.c: remove no meaning variable from snd_soc_dapm_add_path()
snd_soc_dapm_add_path() is using local variable "widgets[]", but it is same as path->node[]. This is no meaning and duplicate operation. This patch removes "widgets[]". path->node[SND_SOC_DAPM_DIR_IN] = wsource; path->node[SND_SOC_DAPM_DIR_OUT] = wsink; widgets[SND_SOC_DAPM_DIR_IN] = wsource; widgets[SND_SOC_DAPM_DIR_OUT] = wsink; Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/877d0wtzsx.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
f19a2ec7a3
Коммит
943402b54e
|
@ -2826,7 +2826,6 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
|
||||||
int (*connected)(struct snd_soc_dapm_widget *source,
|
int (*connected)(struct snd_soc_dapm_widget *source,
|
||||||
struct snd_soc_dapm_widget *sink))
|
struct snd_soc_dapm_widget *sink))
|
||||||
{
|
{
|
||||||
struct snd_soc_dapm_widget *widgets[2];
|
|
||||||
enum snd_soc_dapm_direction dir;
|
enum snd_soc_dapm_direction dir;
|
||||||
struct snd_soc_dapm_path *path;
|
struct snd_soc_dapm_path *path;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -2862,8 +2861,6 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
|
||||||
|
|
||||||
path->node[SND_SOC_DAPM_DIR_IN] = wsource;
|
path->node[SND_SOC_DAPM_DIR_IN] = wsource;
|
||||||
path->node[SND_SOC_DAPM_DIR_OUT] = wsink;
|
path->node[SND_SOC_DAPM_DIR_OUT] = wsink;
|
||||||
widgets[SND_SOC_DAPM_DIR_IN] = wsource;
|
|
||||||
widgets[SND_SOC_DAPM_DIR_OUT] = wsink;
|
|
||||||
|
|
||||||
path->connected = connected;
|
path->connected = connected;
|
||||||
INIT_LIST_HEAD(&path->list);
|
INIT_LIST_HEAD(&path->list);
|
||||||
|
@ -2905,12 +2902,13 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
|
||||||
}
|
}
|
||||||
|
|
||||||
list_add(&path->list, &dapm->card->paths);
|
list_add(&path->list, &dapm->card->paths);
|
||||||
|
|
||||||
snd_soc_dapm_for_each_direction(dir)
|
snd_soc_dapm_for_each_direction(dir)
|
||||||
list_add(&path->list_node[dir], &widgets[dir]->edges[dir]);
|
list_add(&path->list_node[dir], &path->node[dir]->edges[dir]);
|
||||||
|
|
||||||
snd_soc_dapm_for_each_direction(dir) {
|
snd_soc_dapm_for_each_direction(dir) {
|
||||||
dapm_update_widget_flags(widgets[dir]);
|
dapm_update_widget_flags(path->node[dir]);
|
||||||
dapm_mark_dirty(widgets[dir], "Route added");
|
dapm_mark_dirty(path->node[dir], "Route added");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dapm->card->instantiated && path->connect)
|
if (dapm->card->instantiated && path->connect)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче