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

Commit 519fb63e authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: dapm: mark dapm_kcontrol_get_wlist as global function" into msm-4.8

parents 889f8edb e5c7d7c1

include/sound/soc-dapm.h

+2 −0
Original line number Diff line number Diff line
@@ -466,6 +466,8 @@ 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

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

}



static struct snd_soc_dapm_widget_list *dapm_kcontrol_get_wlist(

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)