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

Commit d7672b75 authored by Banajit Goswami's avatar Banajit Goswami
Browse files

Revert "ASoC: dapm: mark dapm_kcontrol_get_wlist as global function" 



This reverts commit e5c7d7c1.
This change is no longer required as the wrapper available in upstream
snd_soc_dapm_kcontrol_widget() can be used for the same purpose of
accessing the parent widget for a given kcontrol.

Change-Id: I6af4b6cab1f51e3e9321573a08777dbedce62243
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent 8b3579b8

include/sound/soc-dapm.h

+0 −2
Original line number Diff line number Diff line
@@ -466,8 +466,6 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, 


struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(

	struct snd_kcontrol *kcontrol);

struct snd_soc_dapm_widget_list *dapm_kcontrol_get_wlist(

	const struct snd_kcontrol *kcontrol);



struct snd_soc_dapm_widget *snd_soc_dapm_kcontrol_widget(

		struct snd_kcontrol *kcontrol);

sound/soc/soc-dapm.c

+1 −2
Original line number Diff line number Diff line
@@ -423,14 +423,13 @@ static void dapm_kcontrol_free(struct snd_kcontrol *kctl) 
	kfree(data);

}



struct snd_soc_dapm_widget_list *dapm_kcontrol_get_wlist(

static struct snd_soc_dapm_widget_list *dapm_kcontrol_get_wlist(

	const struct snd_kcontrol *kcontrol)

{

	struct dapm_kcontrol_data *data = snd_kcontrol_chip(kcontrol);



	return data->wlist;

}

EXPORT_SYMBOL(dapm_kcontrol_get_wlist);



static int dapm_kcontrol_add_widget(struct snd_kcontrol *kcontrol,

	struct snd_soc_dapm_widget *widget)