Skip to content

Commit 4cd7d6c

Browse files
committed
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: 286fe1c ("media: dmx.h: get rid of DMX_GET_CAPS") Fixes: 13adefb ("media: dmx.h: get rid of DMX_SET_SOURCE") Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 12f9286 commit 4cd7d6c

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

drivers/media/dvb-core/dmxdev.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,26 +1025,6 @@ static int dvb_demux_do_ioctl(struct file *file,
10251025
dmxdev->demux->get_pes_pids(dmxdev->demux, parg);
10261026
break;
10271027

1028-
#if 0
1029-
/* Not used upstream and never documented */
1030-
1031-
case DMX_GET_CAPS:
1032-
if (!dmxdev->demux->get_caps) {
1033-
ret = -EINVAL;
1034-
break;
1035-
}
1036-
ret = dmxdev->demux->get_caps(dmxdev->demux, parg);
1037-
break;
1038-
1039-
case DMX_SET_SOURCE:
1040-
if (!dmxdev->demux->set_source) {
1041-
ret = -EINVAL;
1042-
break;
1043-
}
1044-
ret = dmxdev->demux->set_source(dmxdev->demux, parg);
1045-
break;
1046-
#endif
1047-
10481028
case DMX_GET_STC:
10491029
if (!dmxdev->demux->get_stc) {
10501030
ret = -EINVAL;

fs/compat_ioctl.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,8 +1331,6 @@ COMPATIBLE_IOCTL(DMX_SET_FILTER)
13311331
COMPATIBLE_IOCTL(DMX_SET_PES_FILTER)
13321332
COMPATIBLE_IOCTL(DMX_SET_BUFFER_SIZE)
13331333
COMPATIBLE_IOCTL(DMX_GET_PES_PIDS)
1334-
COMPATIBLE_IOCTL(DMX_GET_CAPS)
1335-
COMPATIBLE_IOCTL(DMX_SET_SOURCE)
13361334
COMPATIBLE_IOCTL(DMX_GET_STC)
13371335
COMPATIBLE_IOCTL(FE_GET_INFO)
13381336
COMPATIBLE_IOCTL(FE_DISEQC_RESET_OVERLOAD)

0 commit comments

Comments
 (0)