V4L/DVB (8130): split dvb_ringbuffer dual-use functions

split the suckers into kernel-memory and user-memory versions,
annotate both properly.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 6d7b9f6a6c75..dfe03cb42671 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -587,7 +587,7 @@ static void gpioirq(unsigned long data)
                 }
                 DVB_RINGBUFFER_SKIP(cibuf, 2);
 
-                dvb_ringbuffer_read(cibuf, av7110->debi_virt, len, 0);
+                dvb_ringbuffer_read(cibuf, av7110->debi_virt, len);
 
                 iwdebi(av7110, DEBINOSWAP, TX_LEN, len, 2);
                 iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, len, 2);
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index ec55a968f204..184647ad1c7c 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -269,7 +269,7 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
                 return -1;
         }
 
-        dvb_ringbuffer_read(buf, dest, (size_t) blen, 0);
+        dvb_ringbuffer_read(buf, dest, (size_t) blen);
 
         dprintk(2, "pread=0x%08lx, pwrite=0x%08lx\n",
                (unsigned long) buf->pread, (unsigned long) buf->pwrite);
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index c58e3fc509ed..261135ded481 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -208,7 +208,7 @@ static ssize_t ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file,
                 return -EINVAL;
         DVB_RINGBUFFER_SKIP(cibuf, 2);
 
-        return dvb_ringbuffer_read(cibuf, (u8 *)buf, len, 1);
+        return dvb_ringbuffer_read_user(cibuf, buf, len);
 }
 
 static int dvb_ca_open(struct inode *inode, struct file *file)