Now all snd_soc_pcm_lib_ioctl() calls were dropped, and it became superfluous. Let's kill it.
Signed-off-by: Takashi Iwai tiwai@suse.de --- include/sound/soc.h | 5 ----- sound/soc/soc-core.c | 12 ------------ 2 files changed, 17 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h index c28a1ed5e8df..66648f0e3a87 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1408,11 +1408,6 @@ static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm) mutex_unlock(&dapm->card->dapm_mutex); }
-/* bypass */ -int snd_soc_pcm_lib_ioctl(struct snd_soc_component *component, - struct snd_pcm_substream *substream, - unsigned int cmd, void *arg); - #include <sound/soc-component.h>
#endif diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 062653ab03a3..0e33edf79f39 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -277,18 +277,6 @@ static inline void snd_soc_debugfs_exit(void)
#endif
-/* - * This is glue code between snd_pcm_lib_ioctl() and - * snd_soc_component_driver :: ioctl - */ -int snd_soc_pcm_lib_ioctl(struct snd_soc_component *component, - struct snd_pcm_substream *substream, - unsigned int cmd, void *arg) -{ - return snd_pcm_lib_ioctl(substream, cmd, arg); -} -EXPORT_SYMBOL_GPL(snd_soc_pcm_lib_ioctl); - static int snd_soc_rtdcom_add(struct snd_soc_pcm_runtime *rtd, struct snd_soc_component *component) {