diff options
author | Mark Brown <broonie@kernel.org> | 2017-08-21 21:48:37 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-08-21 21:48:37 +0100 |
commit | f13db334bf7b68b0086d04ab6a51517ba41123b4 (patch) | |
tree | 1ce74e775b64e9804aa5bbece3cdc94fd309912b /include/sound | |
parent | eb59d73cb535ba32df928f210fb9a8529bf465c0 (diff) | |
parent | b47b91c8504c62f95ddff2876620d68697927bd4 (diff) | |
download | linux-f13db334bf7b68b0086d04ab6a51517ba41123b4.tar.gz linux-f13db334bf7b68b0086d04ab6a51517ba41123b4.tar.bz2 linux-f13db334bf7b68b0086d04ab6a51517ba41123b4.zip |
Merge branch 'topic/msm8916' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-const
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 9c94b97c17f8..c4a8b1947566 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -795,10 +795,6 @@ struct snd_soc_component_driver { int (*suspend)(struct snd_soc_component *); int (*resume)(struct snd_soc_component *); - /* pcm creation and destruction */ - int (*pcm_new)(struct snd_soc_pcm_runtime *); - void (*pcm_free)(struct snd_pcm *); - /* DT */ int (*of_xlate_dai_name)(struct snd_soc_component *component, struct of_phandle_args *args, @@ -874,8 +870,6 @@ struct snd_soc_component { void (*remove)(struct snd_soc_component *); int (*suspend)(struct snd_soc_component *); int (*resume)(struct snd_soc_component *); - int (*pcm_new)(struct snd_soc_pcm_runtime *); - void (*pcm_free)(struct snd_pcm *); /* machine specific init */ int (*init)(struct snd_soc_component *component); |