Move audio/video/osd APIs to be together with av7110

PATCH In review Mauro Carvalho Chehab 2 participants 5 messages Jun 2, 2021

Subsystems (3)

Media (V4L/DVB) Staging Ivtv VIDEO4LINUX driver

lore

Share & tools

lore

Mauro Carvalho Chehab

author

2021-06-02 13:25 UTC #0 lore raw

cover Move audio/video/osd APIs to be together with av7110

The ivtv is abusing a DVB API, as this is a V4L2 driver only. While this got fixed several years ago, a backward-compat code
was added on that time (2016) by
commit 6689638025a9 ("[media] ivtv: mark DVB "borrowed" ioctls as deprecated").

It is time to drop support for it.

With that, the only remaining upstream driver to use those APIs is the av7110, which is now at staging. So, move the API to staging too, in order to be together with the driver that will retire on a couple of versions.

Mauro Carvalho Chehab (3):
media: ivtv: get rid of DVB deprecated ioctls
media: dvb header files: move some headers to staging
media: docs: move DVB audio/video docs to staging

 Documentation/userspace-api/media/Makefile    |  10 +-
 .../media/audio.h.rst.exceptions              |  19 --
 .../userspace-api/media/dvb/headers.rst       |   7 -
 .../media/dvb/legacy_dvb_apis.rst             |   7 -
 .../media/video.h.rst.exceptions              |  39 ----
 drivers/media/pci/ivtv/Kconfig                |  12 -
 drivers/media/pci/ivtv/ivtv-driver.h          |   2 -
 drivers/media/pci/ivtv/ivtv-ioctl.c           | 221 ------------------
 .../audio-bilingual-channel-select.rst        |   0
 .../media/av7110}/audio-channel-select.rst    |   0
 .../media/av7110}/audio-clear-buffer.rst      |   0
 .../staging/media/av7110}/audio-continue.rst  |   0
 .../staging/media/av7110}/audio-fclose.rst    |   0
 .../staging/media/av7110}/audio-fopen.rst     |   0
 .../staging/media/av7110}/audio-fwrite.rst    |   0
 .../media/av7110}/audio-get-capabilities.rst  |   0
 .../media/av7110}/audio-get-status.rst        |   0
 .../staging/media/av7110}/audio-pause.rst     |   0
 .../staging/media/av7110}/audio-play.rst      |   0
 .../media/av7110}/audio-select-source.rst     |   0
 .../media/av7110}/audio-set-av-sync.rst       |   0
 .../media/av7110}/audio-set-bypass-mode.rst   |   0
 .../staging/media/av7110}/audio-set-id.rst    |   0
 .../staging/media/av7110}/audio-set-mixer.rst |   0
 .../staging/media/av7110}/audio-set-mute.rst  |   0
 .../media/av7110}/audio-set-streamtype.rst    |   0
 .../staging/media/av7110}/audio-stop.rst      |   0
 .../staging/media/av7110}/audio.h             |   0
 .../staging/media/av7110}/audio.rst           |   0
 .../media/av7110}/audio_data_types.rst        |   0
 .../media/av7110}/audio_function_calls.rst    |   0
 drivers/staging/media/av7110/av7110.h         |   7 +-
 .../staging/media/av7110}/osd.h               |   0
 .../media/av7110}/video-clear-buffer.rst      |   0
 .../staging/media/av7110}/video-command.rst   |   0
 .../staging/media/av7110}/video-continue.rst  |   0
 .../media/av7110}/video-fast-forward.rst      |   0
 .../staging/media/av7110}/video-fclose.rst    |   0
 .../staging/media/av7110}/video-fopen.rst     |   0
 .../staging/media/av7110}/video-freeze.rst    |   0
 .../staging/media/av7110}/video-fwrite.rst    |   0
 .../media/av7110}/video-get-capabilities.rst  |   0
 .../staging/media/av7110}/video-get-event.rst |   0
 .../media/av7110}/video-get-frame-count.rst   |   0
 .../staging/media/av7110}/video-get-pts.rst   |   0
 .../staging/media/av7110}/video-get-size.rst  |   0
 .../media/av7110}/video-get-status.rst        |   0
 .../staging/media/av7110}/video-play.rst      |   0
 .../media/av7110}/video-select-source.rst     |   0
 .../staging/media/av7110}/video-set-blank.rst |   0
 .../av7110}/video-set-display-format.rst      |   0
 .../media/av7110}/video-set-format.rst        |   0
 .../media/av7110}/video-set-streamtype.rst    |   0
 .../media/av7110}/video-slowmotion.rst        |   0
 .../media/av7110}/video-stillpicture.rst      |   0
 .../staging/media/av7110}/video-stop.rst      |   0
 .../media/av7110}/video-try-command.rst       |   0
 .../staging/media/av7110}/video.h             |   0
 .../staging/media/av7110}/video.rst           |   0
 .../media/av7110}/video_function_calls.rst    |   0
 .../staging/media/av7110}/video_types.rst     |   0
 61 files changed, 6 insertions(+), 318 deletions(-)
 delete mode 100644 Documentation/userspace-api/media/audio.h.rst.exceptions
 delete mode 100644 Documentation/userspace-api/media/video.h.rst.exceptions
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-bilingual-channel-select.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-channel-select.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-clear-buffer.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-continue.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fclose.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fopen.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fwrite.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-get-capabilities.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-get-status.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-pause.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-play.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-select-source.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-av-sync.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-bypass-mode.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-id.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-mixer.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-mute.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-streamtype.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-stop.rst (100%)
 rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/audio.h (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio_data_types.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio_function_calls.rst (100%)
 rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/osd.h (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-clear-buffer.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-command.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-continue.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fast-forward.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fclose.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fopen.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-freeze.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fwrite.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-capabilities.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-event.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-frame-count.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-pts.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-size.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-status.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-play.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-select-source.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-blank.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-display-format.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-format.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-streamtype.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-slowmotion.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-stillpicture.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-stop.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-try-command.rst (100%)
 rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/video.h (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video_function_calls.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video_types.rst (100%)

Signature · 1 line

2.31.1

Mauro Carvalho Chehab

author

2021-06-02 13:25 UTC #3 lore raw

PATCH 2/3 media: dvb header files: move some headers to staging

The audio, video and OSD APIs are used upstream only by the av7110 driver, which was moved to staging.

So, move the corresponding header files to it.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---
 .../linux/dvb => drivers/staging/media/av7110}/audio.h     | 0
 drivers/staging/media/av7110/av7110.h                      | 7 ++++---
 .../uapi/linux/dvb => drivers/staging/media/av7110}/osd.h  | 0
 .../linux/dvb => drivers/staging/media/av7110}/video.h     | 0
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/audio.h (100%)
 rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/osd.h (100%)
 rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/video.h (100%)

drivers/staging/media/av7110/audio.h renamed from include/uapi/linux/dvb/audio.h +0 -0

similarity index 100%
rename from include/uapi/linux/dvb/audio.h
rename to drivers/staging/media/av7110/audio.h

drivers/staging/media/av7110/av7110.h +4 -3

index 809d938ae166..b8e8fc8ddbe9 100644
@@ -9,11 +9,12 @@
 #include <linux/input.h>
 #include <linux/time.h>
 
-#include <linux/dvb/video.h>
-#include <linux/dvb/audio.h>
+#include "video.h"
+#include "audio.h"
+#include "osd.h"
+
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/ca.h>
-#include <linux/dvb/osd.h>
 #include <linux/dvb/net.h>
 #include <linux/mutex.h>

drivers/staging/media/av7110/osd.h renamed from include/uapi/linux/dvb/osd.h +0 -0

similarity index 100%
rename from include/uapi/linux/dvb/osd.h
rename to drivers/staging/media/av7110/osd.h

drivers/staging/media/av7110/video.h renamed from include/uapi/linux/dvb/video.h +0 -0

similarity index 100%
rename from include/uapi/linux/dvb/video.h
rename to drivers/staging/media/av7110/video.h

Signature · 1 line

2.31.1

Mauro Carvalho Chehab

author

2021-06-02 13:25 UTC #4 lore raw

PATCH 3/3 media: docs: move DVB audio/video docs to staging

In reply to Mauro Carvalho Chehab

The only upstream driver using the API described there is the av7110 driver.

As the driver was moved to staging, move the API bits to staging as well.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---
 Documentation/userspace-api/media/Makefile    | 10 +----
 .../media/audio.h.rst.exceptions              | 19 ---------
 .../userspace-api/media/dvb/headers.rst       |  7 ----
 .../media/dvb/legacy_dvb_apis.rst             |  7 ----
 .../media/video.h.rst.exceptions              | 39 -------------------
 .../audio-bilingual-channel-select.rst        |  0
 .../media/av7110}/audio-channel-select.rst    |  0
 .../media/av7110}/audio-clear-buffer.rst      |  0
 .../staging/media/av7110}/audio-continue.rst  |  0
 .../staging/media/av7110}/audio-fclose.rst    |  0
 .../staging/media/av7110}/audio-fopen.rst     |  0
 .../staging/media/av7110}/audio-fwrite.rst    |  0
 .../media/av7110}/audio-get-capabilities.rst  |  0
 .../media/av7110}/audio-get-status.rst        |  0
 .../staging/media/av7110}/audio-pause.rst     |  0
 .../staging/media/av7110}/audio-play.rst      |  0
 .../media/av7110}/audio-select-source.rst     |  0
 .../media/av7110}/audio-set-av-sync.rst       |  0
 .../media/av7110}/audio-set-bypass-mode.rst   |  0
 .../staging/media/av7110}/audio-set-id.rst    |  0
 .../staging/media/av7110}/audio-set-mixer.rst |  0
 .../staging/media/av7110}/audio-set-mute.rst  |  0
 .../media/av7110}/audio-set-streamtype.rst    |  0
 .../staging/media/av7110}/audio-stop.rst      |  0
 .../staging/media/av7110}/audio.rst           |  0
 .../media/av7110}/audio_data_types.rst        |  0
 .../media/av7110}/audio_function_calls.rst    |  0
 .../media/av7110}/video-clear-buffer.rst      |  0
 .../staging/media/av7110}/video-command.rst   |  0
 .../staging/media/av7110}/video-continue.rst  |  0
 .../media/av7110}/video-fast-forward.rst      |  0
 .../staging/media/av7110}/video-fclose.rst    |  0
 .../staging/media/av7110}/video-fopen.rst     |  0
 .../staging/media/av7110}/video-freeze.rst    |  0
 .../staging/media/av7110}/video-fwrite.rst    |  0
 .../media/av7110}/video-get-capabilities.rst  |  0
 .../staging/media/av7110}/video-get-event.rst |  0
 .../media/av7110}/video-get-frame-count.rst   |  0
 .../staging/media/av7110}/video-get-pts.rst   |  0
 .../staging/media/av7110}/video-get-size.rst  |  0
 .../media/av7110}/video-get-status.rst        |  0
 .../staging/media/av7110}/video-play.rst      |  0
 .../media/av7110}/video-select-source.rst     |  0
 .../staging/media/av7110}/video-set-blank.rst |  0
 .../av7110}/video-set-display-format.rst      |  0
 .../media/av7110}/video-set-format.rst        |  0
 .../media/av7110}/video-set-streamtype.rst    |  0
 .../media/av7110}/video-slowmotion.rst        |  0
 .../media/av7110}/video-stillpicture.rst      |  0
 .../staging/media/av7110}/video-stop.rst      |  0
 .../media/av7110}/video-try-command.rst       |  0
 .../staging/media/av7110}/video.rst           |  0
 .../media/av7110}/video_function_calls.rst    |  0
 .../staging/media/av7110}/video_types.rst     |  0
 54 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 Documentation/userspace-api/media/audio.h.rst.exceptions
 delete mode 100644 Documentation/userspace-api/media/video.h.rst.exceptions
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-bilingual-channel-select.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-channel-select.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-clear-buffer.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-continue.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fclose.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fopen.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fwrite.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-get-capabilities.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-get-status.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-pause.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-play.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-select-source.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-av-sync.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-bypass-mode.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-id.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-mixer.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-mute.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-streamtype.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-stop.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio_data_types.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio_function_calls.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-clear-buffer.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-command.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-continue.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fast-forward.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fclose.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fopen.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-freeze.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fwrite.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-capabilities.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-event.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-frame-count.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-pts.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-size.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-status.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-play.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-select-source.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-blank.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-display-format.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-format.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-streamtype.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-slowmotion.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-stillpicture.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-stop.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-try-command.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video_function_calls.rst (100%)
 rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video_types.rst (100%)

Documentation/userspace-api/media/Makefile +2 -8

index 81a4a1a53bce..00922aa7efde 100644
@@ -7,8 +7,8 @@ PARSER = $(srctree)/Documentation/sphinx/parse-headers.pl
 UAPI = $(srctree)/include/uapi/linux
 KAPI = $(srctree)/include/linux
 
-FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \
-	  videodev2.h.rst media.h.rst cec.h.rst lirc.h.rst
+FILES = ca.h.rst dmx.h.rst frontend.h.rst net.h.rst \
+	videodev2.h.rst media.h.rst cec.h.rst lirc.h.rst
 
 TARGETS := $(addprefix $(BUILDDIR)/, $(FILES))

@@ -21,9 +21,6 @@ quiet_gen_rst = echo '  PARSE   $(patsubst $(srctree)/%,%,$<)'; \
 
 silent_gen_rst = ${gen_rst}
 
-$(BUILDDIR)/audio.h.rst: ${UAPI}/dvb/audio.h ${PARSER} $(SRC_DIR)/audio.h.rst.exceptions
-	@$($(quiet)gen_rst)
-
 $(BUILDDIR)/ca.h.rst: ${UAPI}/dvb/ca.h ${PARSER} $(SRC_DIR)/ca.h.rst.exceptions
 	@$($(quiet)gen_rst)

@@ -36,9 +33,6 @@ $(BUILDDIR)/frontend.h.rst: ${UAPI}/dvb/frontend.h ${PARSER} $(SRC_DIR)/frontend
 $(BUILDDIR)/net.h.rst: ${UAPI}/dvb/net.h ${PARSER} $(SRC_DIR)/net.h.rst.exceptions
 	@$($(quiet)gen_rst)
 
-$(BUILDDIR)/video.h.rst: ${UAPI}/dvb/video.h ${PARSER} $(SRC_DIR)/video.h.rst.exceptions
-	@$($(quiet)gen_rst)
-
 $(BUILDDIR)/videodev2.h.rst: ${UAPI}/videodev2.h ${PARSER} $(SRC_DIR)/videodev2.h.rst.exceptions
 	@$($(quiet)gen_rst)

Documentation/userspace-api/media/audio.h.rst.exceptions deleted +0 ~~-19~~

deleted file mode 100644
index cf6620477f73..000000000000
@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-# Ignore header name
-ignore define _DVBAUDIO_H_
-
-# Undocumented audio caps, as this is a deprecated API anyway
-ignore define AUDIO_CAP_DTS
-ignore define AUDIO_CAP_LPCM
-ignore define AUDIO_CAP_MP1
-ignore define AUDIO_CAP_MP2
-ignore define AUDIO_CAP_MP3
-ignore define AUDIO_CAP_AAC
-ignore define AUDIO_CAP_OGG
-ignore define AUDIO_CAP_SDDS
-ignore define AUDIO_CAP_AC3
-
-# some typedefs should point to struct/enums
-replace typedef audio_mixer_t :c:type:`audio_mixer`
-replace typedef audio_status_t :c:type:`audio_status`

Documentation/userspace-api/media/dvb/headers.rst +0 -7

index 9743ffc35096..88c3eb33a89e 100644
@@ -14,10 +14,3 @@ Digital TV uAPI headers
 .. kernel-include:: $BUILDDIR/ca.h.rst
 
 .. kernel-include:: $BUILDDIR/net.h.rst
-
-Legacy uAPI
-***********
-
-.. kernel-include:: $BUILDDIR/audio.h.rst
-
-.. kernel-include:: $BUILDDIR/video.h.rst

Documentation/userspace-api/media/dvb/legacy_dvb_apis.rst +0 -7

index 6104879d728a..b97d56ee543c 100644
@@ -11,11 +11,6 @@ The APIs described here **should not** be used on new drivers or applications.
 The DVBv3 frontend API has issues with new delivery systems, including
 DVB-S2, DVB-T2, ISDB, etc.
 
-There's just one driver for a very legacy hardware using the Digital TV
-audio and video APIs. No modern drivers should use it. Instead, audio and
-video should be using the V4L2 and ALSA APIs, and the pipelines should
-be set via the Media Controller API.
-
 .. attention::
 
    The APIs described here doesn't necessarily reflect the current

@@ -28,5 +23,3 @@ be set via the Media Controller API.
     :maxdepth: 1
 
     frontend_legacy_dvbv3_api
-    video
-    audio

Documentation/userspace-api/media/video.h.rst.exceptions deleted +0 ~~-39~~

deleted file mode 100644
index ea9de59ad8b7..000000000000
@@ -1,39 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-# Ignore header name
-ignore define _UAPI_DVBVIDEO_H_
-
-# This is a deprecated obscure API. Just ignore things we don't know
-ignore define VIDEO_CMD_PLAY
-ignore define VIDEO_CMD_STOP
-ignore define VIDEO_CMD_FREEZE
-ignore define VIDEO_CMD_CONTINUE
-ignore define VIDEO_CMD_FREEZE_TO_BLACK
-ignore define VIDEO_CMD_STOP_TO_BLACK
-ignore define VIDEO_CMD_STOP_IMMEDIATELY
-ignore define VIDEO_PLAY_FMT_NONE
-ignore define VIDEO_PLAY_FMT_GOP
-ignore define VIDEO_VSYNC_FIELD_UNKNOWN
-ignore define VIDEO_VSYNC_FIELD_ODD
-ignore define VIDEO_VSYNC_FIELD_EVEN
-ignore define VIDEO_VSYNC_FIELD_PROGRESSIVE
-ignore define VIDEO_EVENT_SIZE_CHANGED
-ignore define VIDEO_EVENT_FRAME_RATE_CHANGED
-ignore define VIDEO_EVENT_DECODER_STOPPED
-ignore define VIDEO_EVENT_VSYNC
-ignore define VIDEO_CAP_MPEG1
-ignore define VIDEO_CAP_MPEG2
-ignore define VIDEO_CAP_SYS
-ignore define VIDEO_CAP_PROG
-ignore define VIDEO_CAP_SPU
-ignore define VIDEO_CAP_NAVI
-ignore define VIDEO_CAP_CSS
-
-# some typedefs should point to struct/enums
-replace typedef video_format_t :c:type:`video_format`
-replace typedef video_system_t :c:type:`video_system`
-replace typedef video_displayformat_t :c:type:`video_displayformat`
-replace typedef video_size_t :c:type:`video_size`
-replace typedef video_stream_source_t :c:type:`video_stream_source`
-replace typedef video_play_state_t :c:type:`video_play_state`
-replace typedef video_navi_pack_t :c:type:`video_navi_pack`

drivers/staging/media/av7110/audio-bilingual-channel-select.rst renamed from Documentation/userspace-api/media/dvb/audio-bilingual-channel-select.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-bilingual-channel-select.rst
rename to drivers/staging/media/av7110/audio-bilingual-channel-select.rst

drivers/staging/media/av7110/audio-channel-select.rst renamed from Documentation/userspace-api/media/dvb/audio-channel-select.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-channel-select.rst
rename to drivers/staging/media/av7110/audio-channel-select.rst

drivers/staging/media/av7110/audio-clear-buffer.rst renamed from Documentation/userspace-api/media/dvb/audio-clear-buffer.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-clear-buffer.rst
rename to drivers/staging/media/av7110/audio-clear-buffer.rst

drivers/staging/media/av7110/audio-continue.rst renamed from Documentation/userspace-api/media/dvb/audio-continue.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-continue.rst
rename to drivers/staging/media/av7110/audio-continue.rst

drivers/staging/media/av7110/audio-fclose.rst renamed from Documentation/userspace-api/media/dvb/audio-fclose.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-fclose.rst
rename to drivers/staging/media/av7110/audio-fclose.rst

drivers/staging/media/av7110/audio-fopen.rst renamed from Documentation/userspace-api/media/dvb/audio-fopen.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-fopen.rst
rename to drivers/staging/media/av7110/audio-fopen.rst

drivers/staging/media/av7110/audio-fwrite.rst renamed from Documentation/userspace-api/media/dvb/audio-fwrite.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-fwrite.rst
rename to drivers/staging/media/av7110/audio-fwrite.rst

drivers/staging/media/av7110/audio-get-capabilities.rst renamed from Documentation/userspace-api/media/dvb/audio-get-capabilities.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-get-capabilities.rst
rename to drivers/staging/media/av7110/audio-get-capabilities.rst

drivers/staging/media/av7110/audio-get-status.rst renamed from Documentation/userspace-api/media/dvb/audio-get-status.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-get-status.rst
rename to drivers/staging/media/av7110/audio-get-status.rst

drivers/staging/media/av7110/audio-pause.rst renamed from Documentation/userspace-api/media/dvb/audio-pause.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-pause.rst
rename to drivers/staging/media/av7110/audio-pause.rst

drivers/staging/media/av7110/audio-play.rst renamed from Documentation/userspace-api/media/dvb/audio-play.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-play.rst
rename to drivers/staging/media/av7110/audio-play.rst

drivers/staging/media/av7110/audio-select-source.rst renamed from Documentation/userspace-api/media/dvb/audio-select-source.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-select-source.rst
rename to drivers/staging/media/av7110/audio-select-source.rst

drivers/staging/media/av7110/audio-set-av-sync.rst renamed from Documentation/userspace-api/media/dvb/audio-set-av-sync.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-set-av-sync.rst
rename to drivers/staging/media/av7110/audio-set-av-sync.rst

drivers/staging/media/av7110/audio-set-bypass-mode.rst renamed from Documentation/userspace-api/media/dvb/audio-set-bypass-mode.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-set-bypass-mode.rst
rename to drivers/staging/media/av7110/audio-set-bypass-mode.rst

drivers/staging/media/av7110/audio-set-id.rst renamed from Documentation/userspace-api/media/dvb/audio-set-id.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-set-id.rst
rename to drivers/staging/media/av7110/audio-set-id.rst

drivers/staging/media/av7110/audio-set-mixer.rst renamed from Documentation/userspace-api/media/dvb/audio-set-mixer.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-set-mixer.rst
rename to drivers/staging/media/av7110/audio-set-mixer.rst

drivers/staging/media/av7110/audio-set-mute.rst renamed from Documentation/userspace-api/media/dvb/audio-set-mute.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-set-mute.rst
rename to drivers/staging/media/av7110/audio-set-mute.rst

drivers/staging/media/av7110/audio-set-streamtype.rst renamed from Documentation/userspace-api/media/dvb/audio-set-streamtype.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-set-streamtype.rst
rename to drivers/staging/media/av7110/audio-set-streamtype.rst

drivers/staging/media/av7110/audio-stop.rst renamed from Documentation/userspace-api/media/dvb/audio-stop.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio-stop.rst
rename to drivers/staging/media/av7110/audio-stop.rst

drivers/staging/media/av7110/audio.rst renamed from Documentation/userspace-api/media/dvb/audio.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio.rst
rename to drivers/staging/media/av7110/audio.rst

drivers/staging/media/av7110/audio_data_types.rst renamed from Documentation/userspace-api/media/dvb/audio_data_types.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio_data_types.rst
rename to drivers/staging/media/av7110/audio_data_types.rst

drivers/staging/media/av7110/audio_function_calls.rst renamed from Documentation/userspace-api/media/dvb/audio_function_calls.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/audio_function_calls.rst
rename to drivers/staging/media/av7110/audio_function_calls.rst

drivers/staging/media/av7110/video-clear-buffer.rst renamed from Documentation/userspace-api/media/dvb/video-clear-buffer.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-clear-buffer.rst
rename to drivers/staging/media/av7110/video-clear-buffer.rst

drivers/staging/media/av7110/video-command.rst renamed from Documentation/userspace-api/media/dvb/video-command.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-command.rst
rename to drivers/staging/media/av7110/video-command.rst

drivers/staging/media/av7110/video-continue.rst renamed from Documentation/userspace-api/media/dvb/video-continue.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-continue.rst
rename to drivers/staging/media/av7110/video-continue.rst

drivers/staging/media/av7110/video-fast-forward.rst renamed from Documentation/userspace-api/media/dvb/video-fast-forward.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-fast-forward.rst
rename to drivers/staging/media/av7110/video-fast-forward.rst

drivers/staging/media/av7110/video-fclose.rst renamed from Documentation/userspace-api/media/dvb/video-fclose.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-fclose.rst
rename to drivers/staging/media/av7110/video-fclose.rst

drivers/staging/media/av7110/video-fopen.rst renamed from Documentation/userspace-api/media/dvb/video-fopen.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-fopen.rst
rename to drivers/staging/media/av7110/video-fopen.rst

drivers/staging/media/av7110/video-freeze.rst renamed from Documentation/userspace-api/media/dvb/video-freeze.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-freeze.rst
rename to drivers/staging/media/av7110/video-freeze.rst

drivers/staging/media/av7110/video-fwrite.rst renamed from Documentation/userspace-api/media/dvb/video-fwrite.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-fwrite.rst
rename to drivers/staging/media/av7110/video-fwrite.rst

drivers/staging/media/av7110/video-get-capabilities.rst renamed from Documentation/userspace-api/media/dvb/video-get-capabilities.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-get-capabilities.rst
rename to drivers/staging/media/av7110/video-get-capabilities.rst

drivers/staging/media/av7110/video-get-event.rst renamed from Documentation/userspace-api/media/dvb/video-get-event.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-get-event.rst
rename to drivers/staging/media/av7110/video-get-event.rst

drivers/staging/media/av7110/video-get-frame-count.rst renamed from Documentation/userspace-api/media/dvb/video-get-frame-count.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-get-frame-count.rst
rename to drivers/staging/media/av7110/video-get-frame-count.rst

drivers/staging/media/av7110/video-get-pts.rst renamed from Documentation/userspace-api/media/dvb/video-get-pts.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-get-pts.rst
rename to drivers/staging/media/av7110/video-get-pts.rst

drivers/staging/media/av7110/video-get-size.rst renamed from Documentation/userspace-api/media/dvb/video-get-size.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-get-size.rst
rename to drivers/staging/media/av7110/video-get-size.rst

drivers/staging/media/av7110/video-get-status.rst renamed from Documentation/userspace-api/media/dvb/video-get-status.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-get-status.rst
rename to drivers/staging/media/av7110/video-get-status.rst

drivers/staging/media/av7110/video-play.rst renamed from Documentation/userspace-api/media/dvb/video-play.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-play.rst
rename to drivers/staging/media/av7110/video-play.rst

drivers/staging/media/av7110/video-select-source.rst renamed from Documentation/userspace-api/media/dvb/video-select-source.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-select-source.rst
rename to drivers/staging/media/av7110/video-select-source.rst

drivers/staging/media/av7110/video-set-blank.rst renamed from Documentation/userspace-api/media/dvb/video-set-blank.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-set-blank.rst
rename to drivers/staging/media/av7110/video-set-blank.rst

drivers/staging/media/av7110/video-set-display-format.rst renamed from Documentation/userspace-api/media/dvb/video-set-display-format.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-set-display-format.rst
rename to drivers/staging/media/av7110/video-set-display-format.rst

drivers/staging/media/av7110/video-set-format.rst renamed from Documentation/userspace-api/media/dvb/video-set-format.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-set-format.rst
rename to drivers/staging/media/av7110/video-set-format.rst

drivers/staging/media/av7110/video-set-streamtype.rst renamed from Documentation/userspace-api/media/dvb/video-set-streamtype.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-set-streamtype.rst
rename to drivers/staging/media/av7110/video-set-streamtype.rst

drivers/staging/media/av7110/video-slowmotion.rst renamed from Documentation/userspace-api/media/dvb/video-slowmotion.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-slowmotion.rst
rename to drivers/staging/media/av7110/video-slowmotion.rst

drivers/staging/media/av7110/video-stillpicture.rst renamed from Documentation/userspace-api/media/dvb/video-stillpicture.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-stillpicture.rst
rename to drivers/staging/media/av7110/video-stillpicture.rst

drivers/staging/media/av7110/video-stop.rst renamed from Documentation/userspace-api/media/dvb/video-stop.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-stop.rst
rename to drivers/staging/media/av7110/video-stop.rst

drivers/staging/media/av7110/video-try-command.rst renamed from Documentation/userspace-api/media/dvb/video-try-command.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video-try-command.rst
rename to drivers/staging/media/av7110/video-try-command.rst

drivers/staging/media/av7110/video.rst renamed from Documentation/userspace-api/media/dvb/video.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video.rst
rename to drivers/staging/media/av7110/video.rst

drivers/staging/media/av7110/video_function_calls.rst renamed from Documentation/userspace-api/media/dvb/video_function_calls.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video_function_calls.rst
rename to drivers/staging/media/av7110/video_function_calls.rst

drivers/staging/media/av7110/video_types.rst renamed from Documentation/userspace-api/media/dvb/video_types.rst +0 -0

similarity index 100%
rename from Documentation/userspace-api/media/dvb/video_types.rst
rename to drivers/staging/media/av7110/video_types.rst

Signature · 1 line

2.31.1

Mauro Carvalho Chehab

author

2021-06-02 13:25 UTC #1 lore raw

PATCH 1/3 media: ivtv: get rid of DVB deprecated ioctls

In reply to Mauro Carvalho Chehab

The ivtv driver has gained support a long time ago for audio and video settings via V4L2 API.

Let's drop support of the duplicated controls implemented abusing the DVB API.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---
 drivers/media/pci/ivtv/Kconfig       |  12 --
 drivers/media/pci/ivtv/ivtv-driver.h |   2 -
 drivers/media/pci/ivtv/ivtv-ioctl.c  | 221 ---------------------------
 3 files changed, 235 deletions(-)

drivers/media/pci/ivtv/Kconfig +0 ~~-12~~

index c729e54692c4..e70502902b73 100644
@@ -29,18 +29,6 @@ config VIDEO_IVTV
 	  To compile this driver as a module, choose M here: the
 	  module will be called ivtv.
 
-config VIDEO_IVTV_DEPRECATED_IOCTLS
-	bool "enable the DVB ioctls abuse on ivtv driver"
-	depends on VIDEO_IVTV
-	help
-	  Enable the usage of the a DVB set of ioctls that were abused by
-	  IVTV driver for a while.
-
-	  Those ioctls were not needed for a long time, as IVTV implements
-	  the proper V4L2 ioctls since kernel 3.3.
-
-	  If unsure, say N.
-
 config VIDEO_IVTV_ALSA
 	tristate "Conexant cx23415/cx23416 ALSA interface for PCM audio capture"
 	depends on VIDEO_IVTV && SND

drivers/media/pci/ivtv/ivtv-driver.h +0 -2

index e5efe525ad7b..4cf92dee6527 100644
@@ -57,8 +57,6 @@
 #include <linux/uaccess.h>
 #include <asm/byteorder.h>
 
-#include <linux/dvb/video.h>
-#include <linux/dvb/audio.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>

drivers/media/pci/ivtv/ivtv-ioctl.c +0 ~~-221~~

256 lines not on this page · raw message

Signature · 1 line

2.31.1

Hans Verkuil

Acked-by on v1 1/3

2021-06-02 13:34 UTC #2 lore raw

Re: [PATCH 1/3] media: ivtv: get rid of DVB deprecated ioctls

Quoted 5 lines · Mauro Carvalho Chehab

The ivtv driver has gained support a long time ago for audio and video settings via V4L2 API.
Let's drop support of the duplicated controls implemented abusing the DVB API.

I thought these were removed a long time ago :-)

In any case:

Acked-by Hans Verkuil <[email protected]>

Thanks!

Hans

Quoted 310 lines

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---
 drivers/media/pci/ivtv/Kconfig       |  12 --
 drivers/media/pci/ivtv/ivtv-driver.h |   2 -
 drivers/media/pci/ivtv/ivtv-ioctl.c  | 221 ---------------------------
 3 files changed, 235 deletions(-)

drivers/media/pci/ivtv/Kconfig +0 ~~-12~~

index c729e54692c4..e70502902b73 100644
@@ -29,18 +29,6 @@ config VIDEO_IVTV
 	  To compile this driver as a module, choose M here: the
 	  module will be called ivtv.
 
-config VIDEO_IVTV_DEPRECATED_IOCTLS
-	bool "enable the DVB ioctls abuse on ivtv driver"
-	depends on VIDEO_IVTV
-	help
-	  Enable the usage of the a DVB set of ioctls that were abused by
-	  IVTV driver for a while.
-
-	  Those ioctls were not needed for a long time, as IVTV implements
-	  the proper V4L2 ioctls since kernel 3.3.
-
-	  If unsure, say N.
-
 config VIDEO_IVTV_ALSA
 	tristate "Conexant cx23415/cx23416 ALSA interface for PCM audio capture"
 	depends on VIDEO_IVTV && SND

drivers/media/pci/ivtv/ivtv-driver.h +0 -2

index e5efe525ad7b..4cf92dee6527 100644
@@ -57,8 +57,6 @@
 #include <linux/uaccess.h>
 #include <asm/byteorder.h>
 
-#include <linux/dvb/video.h>
-#include <linux/dvb/audio.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>

drivers/media/pci/ivtv/ivtv-ioctl.c +0 ~~-221~~

index 35dccb31174c..da19b2e95e6c 100644
@@ -23,11 +23,6 @@
 #include <media/i2c/saa7127.h>
 #include <media/tveeprom.h>
 #include <media/v4l2-event.h>
-#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
-#include <linux/compat.h>
-#include <linux/dvb/audio.h>
-#include <linux/dvb/video.h>
-#endif
 
 u16 ivtv_service2vbi(int type)
 {

@@ -1606,38 +1601,11 @@ static int ivtv_try_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder
 	return ivtv_video_command(itv, id, dec, true);
 }
 
-#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
-static __inline__ void warn_deprecated_ioctl(const char *name)
-{
-	pr_warn_once("warning: the %s ioctl is deprecated. Don't use it, as it will be removed soon\n",
-		     name);
-}
-
-#ifdef CONFIG_COMPAT
-struct compat_video_event {
-	__s32 type;
-	/* unused, make sure to use atomic time for y2038 if it ever gets used */
-	compat_long_t timestamp;
-	union {
-		video_size_t size;
-		unsigned int frame_rate;        /* in frames per 1000sec */
-		unsigned char vsync_field;      /* unknown/odd/even/progressive */
-	} u;
-};
-#define VIDEO_GET_EVENT32 _IOR('o', 28, struct compat_video_event)
-#endif
-
-#endif
-
 static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg)
 {
 	struct ivtv_open_id *id = fh2id(filp->private_data);
 	struct ivtv *itv = id->itv;
 	struct ivtv_stream *s = &itv->streams[id->type];
-#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
-	int nonblocking = filp->f_flags & O_NONBLOCK;
-	unsigned long iarg = (unsigned long)arg;
-#endif
 
 	switch (cmd) {
 	case IVTV_IOC_DMA_FRAME: {

@@ -1669,169 +1637,6 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg)
 		if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
 			return -EINVAL;
 		return ivtv_passthrough_mode(itv, *(int *)arg != 0);
-#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
-	case VIDEO_GET_PTS: {
-		s64 *pts = arg;
-		s64 frame;
-
-		warn_deprecated_ioctl("VIDEO_GET_PTS");
-		if (s->type < IVTV_DEC_STREAM_TYPE_MPG) {
-			*pts = s->dma_pts;
-			break;
-		}
-		if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
-			return -EINVAL;
-		return ivtv_g_pts_frame(itv, pts, &frame);
-	}
-
-	case VIDEO_GET_FRAME_COUNT: {
-		s64 *frame = arg;
-		s64 pts;
-
-		warn_deprecated_ioctl("VIDEO_GET_FRAME_COUNT");
-		if (s->type < IVTV_DEC_STREAM_TYPE_MPG) {
-			*frame = 0;
-			break;
-		}
-		if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
-			return -EINVAL;
-		return ivtv_g_pts_frame(itv, &pts, frame);
-	}
-
-	case VIDEO_PLAY: {
-		struct v4l2_decoder_cmd dc;
-
-		warn_deprecated_ioctl("VIDEO_PLAY");
-		memset(&dc, 0, sizeof(dc));
-		dc.cmd = V4L2_DEC_CMD_START;
-		return ivtv_video_command(itv, id, &dc, 0);
-	}
-
-	case VIDEO_STOP: {
-		struct v4l2_decoder_cmd dc;
-
-		warn_deprecated_ioctl("VIDEO_STOP");
-		memset(&dc, 0, sizeof(dc));
-		dc.cmd = V4L2_DEC_CMD_STOP;
-		dc.flags = V4L2_DEC_CMD_STOP_TO_BLACK | V4L2_DEC_CMD_STOP_IMMEDIATELY;
-		return ivtv_video_command(itv, id, &dc, 0);
-	}
-
-	case VIDEO_FREEZE: {
-		struct v4l2_decoder_cmd dc;
-
-		warn_deprecated_ioctl("VIDEO_FREEZE");
-		memset(&dc, 0, sizeof(dc));
-		dc.cmd = V4L2_DEC_CMD_PAUSE;
-		return ivtv_video_command(itv, id, &dc, 0);
-	}
-
-	case VIDEO_CONTINUE: {
-		struct v4l2_decoder_cmd dc;
-
-		warn_deprecated_ioctl("VIDEO_CONTINUE");
-		memset(&dc, 0, sizeof(dc));
-		dc.cmd = V4L2_DEC_CMD_RESUME;
-		return ivtv_video_command(itv, id, &dc, 0);
-	}
-
-	case VIDEO_COMMAND:
-	case VIDEO_TRY_COMMAND: {
-		/* Note: struct v4l2_decoder_cmd has the same layout as
-		   struct video_command */
-		struct v4l2_decoder_cmd *dc = arg;
-		int try = (cmd == VIDEO_TRY_COMMAND);
-
-		if (try)
-			warn_deprecated_ioctl("VIDEO_TRY_COMMAND");
-		else
-			warn_deprecated_ioctl("VIDEO_COMMAND");
-		return ivtv_video_command(itv, id, dc, try);
-	}
-
-#ifdef CONFIG_COMPAT
-	case VIDEO_GET_EVENT32:
-#endif
-	case VIDEO_GET_EVENT: {
-#ifdef CONFIG_COMPAT
-		struct compat_video_event *ev32 = arg;
-#endif
-		struct video_event *ev = arg;
-		DEFINE_WAIT(wait);
-
-		warn_deprecated_ioctl("VIDEO_GET_EVENT");
-		if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
-			return -EINVAL;
-		memset(ev, 0, sizeof(*ev));
-		set_bit(IVTV_F_I_EV_VSYNC_ENABLED, &itv->i_flags);
-
-		while (1) {
-			if (test_and_clear_bit(IVTV_F_I_EV_DEC_STOPPED, &itv->i_flags))
-				ev->type = VIDEO_EVENT_DECODER_STOPPED;
-			else if (test_and_clear_bit(IVTV_F_I_EV_VSYNC, &itv->i_flags)) {
-				unsigned char vsync_field;
-
-				ev->type = VIDEO_EVENT_VSYNC;
-				vsync_field = test_bit(IVTV_F_I_EV_VSYNC_FIELD, &itv->i_flags) ?
-					VIDEO_VSYNC_FIELD_ODD : VIDEO_VSYNC_FIELD_EVEN;
-				if (itv->output_mode == OUT_UDMA_YUV &&
-					(itv->yuv_info.lace_mode & IVTV_YUV_MODE_MASK) ==
-								IVTV_YUV_MODE_PROGRESSIVE) {
-					vsync_field = VIDEO_VSYNC_FIELD_PROGRESSIVE;
-				}
-#ifdef CONFIG_COMPAT
-				if (cmd == VIDEO_GET_EVENT32)
-					ev32->u.vsync_field = vsync_field;
-				else
-#endif
-					ev->u.vsync_field = vsync_field;
-			}
-			if (ev->type)
-				return 0;
-			if (nonblocking)
-				return -EAGAIN;
-			/* Wait for event. Note that serialize_lock is locked,
-			   so to allow other processes to access the driver while
-			   we are waiting unlock first and later lock again. */
-			mutex_unlock(&itv->serialize_lock);
-			prepare_to_wait(&itv->event_waitq, &wait, TASK_INTERRUPTIBLE);
-			if (!test_bit(IVTV_F_I_EV_DEC_STOPPED, &itv->i_flags) &&
-			    !test_bit(IVTV_F_I_EV_VSYNC, &itv->i_flags))
-				schedule();
-			finish_wait(&itv->event_waitq, &wait);
-			mutex_lock(&itv->serialize_lock);
-			if (signal_pending(current)) {
-				/* return if a signal was received */
-				IVTV_DEBUG_INFO("User stopped wait for event\n");
-				return -EINTR;
-			}
-		}
-		break;
-	}
-
-	case VIDEO_SELECT_SOURCE:
-		warn_deprecated_ioctl("VIDEO_SELECT_SOURCE");
-		if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
-			return -EINVAL;
-		return ivtv_passthrough_mode(itv, iarg == VIDEO_SOURCE_DEMUX);
-
-	case AUDIO_SET_MUTE:
-		warn_deprecated_ioctl("AUDIO_SET_MUTE");
-		itv->speed_mute_audio = iarg;
-		return 0;
-
-	case AUDIO_CHANNEL_SELECT:
-		warn_deprecated_ioctl("AUDIO_CHANNEL_SELECT");
-		if (iarg > AUDIO_STEREO_SWAPPED)
-			return -EINVAL;
-		return v4l2_ctrl_s_ctrl(itv->ctrl_audio_playback, iarg + 1);
-
-	case AUDIO_BILINGUAL_CHANNEL_SELECT:
-		warn_deprecated_ioctl("AUDIO_BILINGUAL_CHANNEL_SELECT");
-		if (iarg > AUDIO_STEREO_SWAPPED)
-			return -EINVAL;
-		return v4l2_ctrl_s_ctrl(itv->ctrl_audio_multilingual_playback, iarg + 1);
-#endif
 	default:
 		return -EINVAL;
 	}

@@ -1846,17 +1651,6 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio,
 	if (!valid_prio) {
 		switch (cmd) {
 		case IVTV_IOC_PASSTHROUGH_MODE:
-#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
-		case VIDEO_PLAY:
-		case VIDEO_STOP:
-		case VIDEO_FREEZE:
-		case VIDEO_CONTINUE:
-		case VIDEO_COMMAND:
-		case VIDEO_SELECT_SOURCE:
-		case AUDIO_SET_MUTE:
-		case AUDIO_CHANNEL_SELECT:
-		case AUDIO_BILINGUAL_CHANNEL_SELECT:
-#endif
 			return -EBUSY;
 		}
 	}

@@ -1874,21 +1668,6 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio,
 
 	case IVTV_IOC_DMA_FRAME:
 	case IVTV_IOC_PASSTHROUGH_MODE:
-#ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS
-	case VIDEO_GET_PTS:
-	case VIDEO_GET_FRAME_COUNT:
-	case VIDEO_GET_EVENT:
-	case VIDEO_PLAY:
-	case VIDEO_STOP:
-	case VIDEO_FREEZE:
-	case VIDEO_CONTINUE:
-	case VIDEO_COMMAND:
-	case VIDEO_TRY_COMMAND:
-	case VIDEO_SELECT_SOURCE:
-	case AUDIO_SET_MUTE:
-	case AUDIO_CHANNEL_SELECT:
-	case AUDIO_BILINGUAL_CHANNEL_SELECT:
-#endif
 		return ivtv_decoder_ioctls(file, cmd, (void *)arg);
 
 	default: