OSDN Git Service

ASoC: soc-pcm: remove soc_rtdcom_copy_kernel()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 26 Jul 2019 04:49:29 +0000 (13:49 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 5 Aug 2019 15:15:41 +0000 (16:15 +0100)
No ALSA SoC driver has .copy_kernel at component->driver->ops.
We can revive it if some-driver want to use it, but let's remove it
so far to avoid maintaining complex code

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87lfwl5rot.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-pcm.c

index bf04b69..e855482 100644 (file)
@@ -2896,28 +2896,6 @@ static int soc_rtdcom_copy_user(struct snd_pcm_substream *substream, int channel
        return -EINVAL;
 }
 
-static int soc_rtdcom_copy_kernel(struct snd_pcm_substream *substream, int channel,
-                                 unsigned long pos, void *buf, unsigned long bytes)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_rtdcom_list *rtdcom;
-       struct snd_soc_component *component;
-
-       for_each_rtdcom(rtd, rtdcom) {
-               component = rtdcom->component;
-
-               if (!component->driver->ops ||
-                   !component->driver->ops->copy_kernel)
-                       continue;
-
-               /* FIXME. it returns 1st copy now */
-               return component->driver->ops->copy_kernel(substream, channel,
-                                                          pos, buf, bytes);
-       }
-
-       return -EINVAL;
-}
-
 static int soc_rtdcom_fill_silence(struct snd_pcm_substream *substream, int channel,
                                   unsigned long pos, unsigned long bytes)
 {
@@ -3111,8 +3089,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
 
                if (ops->copy_user)
                        rtd->ops.copy_user      = soc_rtdcom_copy_user;
-               if (ops->copy_kernel)
-                       rtd->ops.copy_kernel    = soc_rtdcom_copy_kernel;
                if (ops->fill_silence)
                        rtd->ops.fill_silence   = soc_rtdcom_fill_silence;
                if (ops->page)