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

Commit 7d651406 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents c186a0cd d7672b75

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/codecs/msm_sdw/msm_sdw_cdc.c

+4 −6
Original line number Diff line number Diff line
@@ -937,9 +937,8 @@ static int msm_sdw_ear_spkr_pa_gain_put(struct snd_kcontrol *kcontrol, 
static int msm_sdw_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct msm_sdw_priv *msm_sdw_p = snd_soc_codec_get_drvdata(codec);
@@ -951,9 +950,8 @@ static int msm_sdw_vi_feed_mixer_get(struct snd_kcontrol *kcontrol, 
static int msm_sdw_vi_feed_mixer_put(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct msm_sdw_priv *msm_sdw_p = snd_soc_codec_get_drvdata(codec);

	struct soc_multi_mixer_control *mixer =

sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c

+1 −3
Original line number Diff line number Diff line
@@ -122,9 +122,7 @@ static void disable_digital_callback(void *flag) 
static int msm_dig_cdc_put_dec_enum(struct snd_kcontrol *kcontrol,

				    struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

			dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *w = wlist->widgets[0];

	struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int dec_mux, decimator;

sound/soc/codecs/wcd9335.c

+20 −30
Original line number Diff line number Diff line
@@ -2261,9 +2261,8 @@ static const struct snd_kcontrol_new hph_type_detect_controls[] = { 
static int tasha_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);
@@ -2275,9 +2274,8 @@ static int tasha_vi_feed_mixer_get(struct snd_kcontrol *kcontrol, 
static int tasha_vi_feed_mixer_put(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = tasha_p->wcd9xxx;
@@ -2328,9 +2326,8 @@ static int tasha_vi_feed_mixer_put(struct snd_kcontrol *kcontrol, 
static int slim_tx_mixer_get(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);
@@ -2341,9 +2338,8 @@ static int slim_tx_mixer_get(struct snd_kcontrol *kcontrol, 
static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -2436,9 +2432,8 @@ static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol, 
static int slim_rx_mux_get(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);
@@ -2454,9 +2449,8 @@ static const char *const slim_rx_mux_text[] = { 
static int slim_rx_mux_put(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -8505,9 +8499,8 @@ static const struct snd_kcontrol_new tasha_snd_controls[] = { 
static int tasha_put_dec_enum(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;
@@ -8565,9 +8558,8 @@ static int tasha_put_dec_enum(struct snd_kcontrol *kcontrol, 
static int tasha_int_dem_inp_mux_put(struct snd_kcontrol *kcontrol,

				 struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;
@@ -8899,9 +8891,8 @@ static int tasha_codec_configure_cpe_input(struct snd_soc_dapm_widget *w, 
static int tasha_codec_aif4_mixer_switch_get(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

			dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);
@@ -8918,9 +8909,8 @@ static int tasha_codec_aif4_mixer_switch_get(struct snd_kcontrol *kcontrol, 
static int tasha_codec_aif4_mixer_switch_put(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

			dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_dapm_update *update = NULL;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);

sound/soc/codecs/wcd934x/wcd934x.c

+16 −24
Original line number Diff line number Diff line
@@ -1110,9 +1110,8 @@ static int tavil_put_clkmode(struct snd_kcontrol *kcontrol, 
static int tavil_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);
@@ -1124,9 +1123,8 @@ static int tavil_vi_feed_mixer_get(struct snd_kcontrol *kcontrol, 
static int tavil_vi_feed_mixer_put(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -1176,9 +1174,8 @@ static int tavil_vi_feed_mixer_put(struct snd_kcontrol *kcontrol, 
static int slim_tx_mixer_get(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);
@@ -1189,9 +1186,8 @@ static int slim_tx_mixer_get(struct snd_kcontrol *kcontrol, 
static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -1271,9 +1267,8 @@ static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol, 
static int slim_rx_mux_get(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);
@@ -1285,9 +1280,8 @@ static int slim_rx_mux_get(struct snd_kcontrol *kcontrol, 
static int slim_rx_mux_put(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -5929,9 +5923,8 @@ static const struct snd_kcontrol_new tavil_snd_controls[] = { 
static int tavil_dec_enum_put(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;
@@ -5989,9 +5982,8 @@ static int tavil_dec_enum_put(struct snd_kcontrol *kcontrol, 
static int tavil_int_dem_inp_mux_put(struct snd_kcontrol *kcontrol,

				     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;