Skip to content

L
linux
Commit 2c36c2ce authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'for-3.0' into for-3.1

parents ddee627c 4b80b8c2
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
sound/soc/soc-dapm.c
View file @ 2c36c2ce
...@@ -337,9 +337,9 @@ static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm, ...@@ -337,9 +337,9 @@ static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
} }
/* create new dapm mixer control */ /* create new dapm mixer control */
static int dapm_new_mixer(struct snd_soc_dapm_context *dapm, static int dapm_new_mixer(struct snd_soc_dapm_widget *w)
struct snd_soc_dapm_widget *w)
{ {
struct snd_soc_dapm_context *dapm = w->dapm;
int i, ret = 0; int i, ret = 0;
size_t name_len, prefix_len; size_t name_len, prefix_len;
struct snd_soc_dapm_path *path; struct snd_soc_dapm_path *path;
...@@ -437,9 +437,9 @@ static int dapm_new_mixer(struct snd_soc_dapm_context *dapm, ...@@ -437,9 +437,9 @@ static int dapm_new_mixer(struct snd_soc_dapm_context *dapm,
} }
/* create new dapm mux control */ /* create new dapm mux control */
static int dapm_new_mux(struct snd_soc_dapm_context *dapm, static int dapm_new_mux(struct snd_soc_dapm_widget *w)
struct snd_soc_dapm_widget *w)
{ {
struct snd_soc_dapm_context *dapm = w->dapm;
struct snd_soc_dapm_path *path = NULL; struct snd_soc_dapm_path *path = NULL;
struct snd_kcontrol *kcontrol; struct snd_kcontrol *kcontrol;
struct snd_card *card = dapm->card->snd_card; struct snd_card *card = dapm->card->snd_card;
...@@ -522,8 +522,7 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm, ...@@ -522,8 +522,7 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm,
} }
/* create new dapm volume control */ /* create new dapm volume control */
static int dapm_new_pga(struct snd_soc_dapm_context *dapm, static int dapm_new_pga(struct snd_soc_dapm_widget *w)
struct snd_soc_dapm_widget *w)
{ {
if (w->num_kcontrols) if (w->num_kcontrols)
dev_err(w->dapm->dev, dev_err(w->dapm->dev,
...@@ -1838,13 +1837,13 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) ...@@ -1838,13 +1837,13 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
case snd_soc_dapm_mixer: case snd_soc_dapm_mixer:
case snd_soc_dapm_mixer_named_ctl: case snd_soc_dapm_mixer_named_ctl:
w->power_check = dapm_generic_check_power; w->power_check = dapm_generic_check_power;
dapm_new_mixer(dapm, w); dapm_new_mixer(w);
break; break;
case snd_soc_dapm_mux: case snd_soc_dapm_mux:
case snd_soc_dapm_virt_mux: case snd_soc_dapm_virt_mux:
case snd_soc_dapm_value_mux: case snd_soc_dapm_value_mux:
w->power_check = dapm_generic_check_power; w->power_check = dapm_generic_check_power;
dapm_new_mux(dapm, w); dapm_new_mux(w);
break; break;
case snd_soc_dapm_adc: case snd_soc_dapm_adc:
case snd_soc_dapm_aif_out: case snd_soc_dapm_aif_out:
...@@ -1857,7 +1856,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) ...@@ -1857,7 +1856,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
case snd_soc_dapm_pga: case snd_soc_dapm_pga:
case snd_soc_dapm_out_drv: case snd_soc_dapm_out_drv:
w->power_check = dapm_generic_check_power; w->power_check = dapm_generic_check_power;
dapm_new_pga(dapm, w); dapm_new_pga(w);
break; break;
case snd_soc_dapm_input: case snd_soc_dapm_input:
case snd_soc_dapm_output: case snd_soc_dapm_output:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7