Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd7d6c9 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: 286fe1ca ("media: dmx.h: get rid of DMX_GET_CAPS")
Fixes: 13adefbe ("media: dmx.h: get rid of DMX_SET_SOURCE")
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 12f92866

drivers/media/dvb-core/dmxdev.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -1025,26 +1025,6 @@ static int dvb_demux_do_ioctl(struct file *file, 
		dmxdev->demux->get_pes_pids(dmxdev->demux, parg);

		dmxdev->demux->get_pes_pids(dmxdev->demux, parg);

		break;

		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:

	case DMX_GET_STC:

		if (!dmxdev->demux->get_stc) {

		if (!dmxdev->demux->get_stc) {

			ret = -EINVAL;

			ret = -EINVAL;

fs/compat_ioctl.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1331,8 +1331,6 @@ COMPATIBLE_IOCTL(DMX_SET_FILTER) 
COMPATIBLE_IOCTL(DMX_SET_PES_FILTER)

COMPATIBLE_IOCTL(DMX_SET_PES_FILTER)

COMPATIBLE_IOCTL(DMX_SET_BUFFER_SIZE)

COMPATIBLE_IOCTL(DMX_SET_BUFFER_SIZE)

COMPATIBLE_IOCTL(DMX_GET_PES_PIDS)

COMPATIBLE_IOCTL(DMX_GET_PES_PIDS)

COMPATIBLE_IOCTL(DMX_GET_CAPS)

COMPATIBLE_IOCTL(DMX_SET_SOURCE)

COMPATIBLE_IOCTL(DMX_GET_STC)

COMPATIBLE_IOCTL(DMX_GET_STC)

COMPATIBLE_IOCTL(FE_GET_INFO)

COMPATIBLE_IOCTL(FE_GET_INFO)

COMPATIBLE_IOCTL(FE_DISEQC_RESET_OVERLOAD)

COMPATIBLE_IOCTL(FE_DISEQC_RESET_OVERLOAD)