[media] dvb: Remove unused frontend sources at demux.h and sync doc

The DVB core has a provision for other frontend sources, but no
drivers use it. The kdapi.xml contains provision for some other
frontend source types, but it is not in sync with the code.

So, remove the unused types and sync both files.

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

diff --git a/Documentation/DocBook/media/dvb/kdapi.xml b/Documentation/DocBook/media/dvb/kdapi.xml
index 1acae67301515cb0be086658a95c82208cfff42a..ff133a326d507cb95b6d33ecfc8697103a0808e1 100644 (file)
--- a/Documentation/DocBook/media/dvb/kdapi.xml
+++ b/Documentation/DocBook/media/dvb/kdapi.xml
@@ -148,14 +148,9 @@ should be kept identical) to the types in the demux device.
  /⋆--------------------------------------------------------------------------⋆/
 
  typedef enum {
-        DMX_OTHER_FE = 0,
-        DMX_SATELLITE_FE,
-        DMX_CABLE_FE,
-        DMX_TERRESTRIAL_FE,
-        DMX_LVDS_FE,
-        DMX_ASI_FE, /⋆ DVB-ASI interface ⋆/
-        DMX_MEMORY_FE
- } dmx_frontend_source_t;
+        DMX_MEMORY_FE,
+        DMX_FRONTEND_0,
+ } dmx_frontend_source;
 
  typedef struct {
         /⋆ The following char⋆ fields point to NULL terminated strings ⋆/
@@ -166,7 +161,7 @@ should be kept identical) to the types in the demux device.
                                                be connected to a particular
                                                demux ⋆/
         void⋆ priv;     /⋆ Pointer to private data of the API client ⋆/
-        dmx_frontend_source_t source;
+        dmx_frontend_source source;
  } dmx_frontend_t;
 
  /⋆--------------------------------------------------------------------------⋆/

diff --git a/drivers/media/dvb-core/demux.h b/drivers/media/dvb-core/demux.h
index 2d036b36f551a1c8be3cfe994dd8a291f2d02739..15b79bdee46548365adbef52f06e7bc5328f6a66 100644 (file)
--- a/drivers/media/dvb-core/demux.h
+++ b/drivers/media/dvb-core/demux.h
@@ -141,13 +141,6 @@ typedef int (*dmx_section_cb) (    const u8 * buffer1,
 enum dmx_frontend_source {
        DMX_MEMORY_FE,
        DMX_FRONTEND_0,
-       DMX_FRONTEND_1,
-       DMX_FRONTEND_2,
-       DMX_FRONTEND_3,
-       DMX_STREAM_0,    /* external stream input, e.g. LVDS */
-       DMX_STREAM_1,
-       DMX_STREAM_2,
-       DMX_STREAM_3
 };
 
 struct dmx_frontend {