V4L/DVB (3501): Dmxdev: use dvb_ringbuffer

Use dvb_ringbuffer instead of an own buffer implementation in
dmxdev.[ch].

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb/dvb-core/dmxdev.h
index 1b3e49bd9aa..d2bee9ffe43 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/drivers/media/dvb/dvb-core/dmxdev.h
@@ -36,6 +36,7 @@
 
 #include "dvbdev.h"
 #include "demux.h"
+#include "dvb_ringbuffer.h"
 
 enum dmxdev_type {
         DMXDEV_TYPE_NONE,
@@ -52,15 +53,6 @@ enum dmxdev_state {
         DMXDEV_STATE_TIMEDOUT
 };
 
-struct dmxdev_buffer {
-        u8 *data;
-        int size;
-        int pread;
-        int pwrite;
-        wait_queue_head_t queue;
-        int error;
-};
-
 struct dmxdev_filter {
         union {
                 struct dmx_section_filter *sec;
@@ -79,7 +71,7 @@ struct dmxdev_filter {
         enum dmxdev_type type;
         enum dmxdev_state state;
         struct dmxdev *dev;
-        struct dmxdev_buffer buffer;
+        struct dvb_ringbuffer buffer;
 
         struct mutex mutex;
 
@@ -102,7 +94,7 @@ struct dmxdev {
 #define DMXDEV_CAP_DUPLEX 1
         struct dmx_frontend *dvr_orig_fe;
 
-        struct dmxdev_buffer dvr_buffer;
+        struct dvb_ringbuffer dvr_buffer;
 #define DVR_BUFFER_SIZE (10*188*1024)
 
         struct mutex mutex;