@@ -71,11 +71,6 @@ struct snd_pcm_ops {
unsigned long pos, unsigned long bytes);
int (*copy)(struct snd_pcm_substream *substream, int channel,
unsigned long pos, sockptr_t buf, unsigned long bytes);
- int (*copy_user)(struct snd_pcm_substream *substream, int channel,
- unsigned long pos, void __user *buf,
- unsigned long bytes);
- int (*copy_kernel)(struct snd_pcm_substream *substream, int channel,
- unsigned long pos, void *buf, unsigned long bytes);
struct page *(*page)(struct snd_pcm_substream *substream,
unsigned long offset);
int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
@@ -2031,19 +2031,6 @@ static int default_read_copy(struct snd_pcm_substream *substream,
return 0;
}
-/* a wrapper for calling old copy_kernel or copy_user ops */
-static int call_old_copy(struct snd_pcm_substream *substream,
- int channel, unsigned long hwoff,
- sockptr_t buf, unsigned long bytes)
-{
- if (sockptr_is_kernel(buf))
- return substream->ops->copy_kernel(substream, channel, hwoff,
- buf.kernel, bytes);
- else
- return substream->ops->copy_user(substream, channel, hwoff,
- buf.user, bytes);
-}
-
/* create a sockptr_t */
static inline sockptr_t make_sockptr(void *p, bool in_kernel)
{
@@ -2241,9 +2228,6 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,
} else {
if (substream->ops->copy)
transfer = substream->ops->copy;
- else if ((in_kernel && substream->ops->copy_kernel) ||
- (!in_kernel && substream->ops->copy_user))
- transfer = call_old_copy;
else
transfer = is_playback ?
default_write_copy : default_read_copy;
@@ -809,7 +809,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
runtime->boundary *= 2;
/* clear the buffer for avoiding possible kernel info leaks */
- if (runtime->dma_area && !substream->ops->copy && !substream->ops->copy_user) {
+ if (runtime->dma_area && !substream->ops->copy) {
size_t size = runtime->dma_bytes;
if (runtime->info & SNDRV_PCM_INFO_MMAP)
Finally all users have been converted to the new PCM copy ops, let's drop the obsoleted copy_kernel and copy_user ops completely. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- include/sound/pcm.h | 5 ----- sound/core/pcm_lib.c | 16 ---------------- sound/core/pcm_native.c | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-)