diff options
author | 2019-09-15 10:31:42 +0100 | |
---|---|---|
committer | 2019-09-15 10:31:42 +0100 | |
commit | 7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec (patch) | |
tree | dda57eb9683f421e9438effbdaf719adced18e3d /sound/soc/soc-topology.c | |
parent | Linux 5.3-rc8 (diff) | |
parent | ASoC: dmaengine: Replace strncpy() with strscpy_pad() for pcm->name (diff) | |
download | linux-7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec.tar.gz linux-7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec.tar.bz2 linux-7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec.zip |
Merge branch 'asoc-5.3' into asoc-linus
Diffstat (limited to 'sound/soc/soc-topology.c')
-rw-r--r-- | sound/soc/soc-topology.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index dc463f1a9e24..2eca85c04a3e 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -80,12 +80,6 @@ struct soc_tplg { static int soc_tplg_process_headers(struct soc_tplg *tplg); static void soc_tplg_complete(struct soc_tplg *tplg); -struct snd_soc_dapm_widget * -snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, - const struct snd_soc_dapm_widget *widget); -struct snd_soc_dapm_widget * -snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, - const struct snd_soc_dapm_widget *widget); static void soc_tplg_denum_remove_texts(struct soc_enum *se); static void soc_tplg_denum_remove_values(struct soc_enum *se); |