[media] dvb: don't keep support for undocumented features

There are two DVB demux callbacks and ioctls that aren't documented
and aren't used at all by the DVB core or by any DVB driver upstream.

Let's comment out the code for those two ioctls and remove on some
future version.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/dvb-core/demux.h b/drivers/media/dvb-core/demux.h
index ca56d1cc57bd412af6a05bb6a041a6c7484bc935..53c82514ede59eca953bcfbcfb4f98648971682d 100644 (file)
--- a/drivers/media/dvb-core/demux.h
+++ b/drivers/media/dvb-core/demux.h
@@ -411,10 +411,12 @@ struct dmx_demux {
 
        int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids);
 
+       /* private: Not used upstream and never documented */
+#if 0
        int (*get_caps) (struct dmx_demux* demux, struct dmx_caps *caps);
-
        int (*set_source) (struct dmx_demux* demux, const dmx_source_t *src);
-
+#endif
+       /* public: */
        int (*get_stc) (struct dmx_demux* demux, unsigned int num,
                        u64 *stc, unsigned int *base);
 };

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index d0e3f9d85f34c7eb9d2c42b88b597ab128025c02..86a987ef13e1fa4e28fcece539f79d37f2f0ddf8 100644 (file)
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1023,6 +1023,9 @@ static int dvb_demux_do_ioctl(struct file *file,
                dmxdev->demux->get_pes_pids(dmxdev->demux, parg);
                break;
 
+#if 0
+       /* Not used upstream and never documented */
+
        case DMX_GET_CAPS:
                if (!dmxdev->demux->get_caps) {
                        ret = -EINVAL;
@@ -1038,6 +1041,7 @@ static int dvb_demux_do_ioctl(struct file *file,
                }
                ret = dmxdev->demux->set_source(dmxdev->demux, parg);
                break;
+#endif
 
        case DMX_GET_STC:
                if (!dmxdev->demux->get_stc) {