media: get rid of removed DMX_GET_CAPS and DMX_SET_SOURCE leftovers

Those two ioctls were never used within the Kernel. Still, there
used to have compat32 code there (and an if #0 block at the core).

Get rid of them.

Fixes: 286fe1ca3fa1 ("media: dmx.h: get rid of DMX_GET_CAPS")
Fixes: 13adefbe9e56 ("media: dmx.h: get rid of DMX_SET_SOURCE")
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 16b0b74c31145a2202aa8fdf3f277e1b013fef5f..18e4230865be3498e14e0c134b918fbeff0c47ff 100644 (file)
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1025,26 +1025,6 @@ 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;
-                       break;
-               }
-               ret = dmxdev->demux->get_caps(dmxdev->demux, parg);
-               break;
-
-       case DMX_SET_SOURCE:
-               if (!dmxdev->demux->set_source) {
-                       ret = -EINVAL;
-                       break;
-               }
-               ret = dmxdev->demux->set_source(dmxdev->demux, parg);
-               break;
-#endif
-
        case DMX_GET_STC:
                if (!dmxdev->demux->get_stc) {
                        ret = -EINVAL;

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 2dd4a7af7dd736f185541cd6dad413cd1d8090ba..d27b326d96f4e0402a01cdf8f7ba7233bd022aa3 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1331,8 +1331,6 @@ COMPATIBLE_IOCTL(DMX_SET_FILTER)
 COMPATIBLE_IOCTL(DMX_SET_PES_FILTER)
 COMPATIBLE_IOCTL(DMX_SET_BUFFER_SIZE)
 COMPATIBLE_IOCTL(DMX_GET_PES_PIDS)
-COMPATIBLE_IOCTL(DMX_GET_CAPS)
-COMPATIBLE_IOCTL(DMX_SET_SOURCE)
 COMPATIBLE_IOCTL(DMX_GET_STC)
 COMPATIBLE_IOCTL(FE_GET_INFO)
 COMPATIBLE_IOCTL(FE_DISEQC_RESET_OVERLOAD)