ASoC: pcm: Drop obsoleted PCM copy_user ops

Now all ASoC users have been replaced to use the new PCM copy ops,
let's drop the obsoleted copy_user ops and its helper function.

Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230815190136.8987-25-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 8040f001f2fb59db0928cff5e50b26d7a0013e45..17bea31445510a41a351e63dcc286167abe9c2b3 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -137,10 +137,6 @@ struct snd_soc_component_driver {
                struct timespec64 *audio_ts,
                struct snd_pcm_audio_tstamp_config *audio_tstamp_config,
                struct snd_pcm_audio_tstamp_report *audio_tstamp_report);
-       int (*copy_user)(struct snd_soc_component *component,
-                        struct snd_pcm_substream *substream, int channel,
-                        unsigned long pos, void __user *buf,
-                        unsigned long bytes);
        int (*copy)(struct snd_soc_component *component,
                    struct snd_pcm_substream *substream, int channel,
                    unsigned long pos, struct iov_iter *buf,
@@ -513,9 +509,6 @@ int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);
 int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
                                unsigned int cmd, void *arg);
 int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream);
-int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
-                                   int channel, unsigned long pos,
-                                   void __user *buf, unsigned long bytes);
 int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream,
                               int channel, unsigned long pos,
                               struct iov_iter *buf, unsigned long bytes);

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index ffa2dd8a21baf07973d714ef074af5a37556c046..f18406dfa1e432b81a1f64932e7b41d222ca4df4 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -1070,26 +1070,6 @@ int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream,
        return -EINVAL;
 }
 
-int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
-                                   int channel, unsigned long pos,
-                                   void __user *buf, unsigned long bytes)
-{
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct snd_soc_component *component;
-       int i;
-
-       /* FIXME. it returns 1st copy now */
-       for_each_rtd_components(rtd, i, component)
-               if (component->driver->copy_user)
-                       return soc_component_ret(
-                               component,
-                               component->driver->copy_user(
-                                       component, substream, channel,
-                                       pos, buf, bytes));
-
-       return -EINVAL;
-}
-
 struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
                                        unsigned long offset)
 {

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 71403da28d3739345c58bee3e75237010cb53522..ae02d1d80c8851cddef6f1974f18b96e3b9082d3 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2975,8 +2975,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
                        rtd->ops.sync_stop      = snd_soc_pcm_component_sync_stop;
                if (drv->copy)
                        rtd->ops.copy           = snd_soc_pcm_component_copy;
-               else if (drv->copy_user)
-                       rtd->ops.copy_user      = snd_soc_pcm_component_copy_user;
                if (drv->page)
                        rtd->ops.page           = snd_soc_pcm_component_page;
                if (drv->mmap)