diff options
| author | Mauro Carvalho Chehab | 2015-10-07 20:43:58 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2015-10-07 20:57:58 +0200 |
| commit | 0693bdf75469487812da7c09949b09ad0396a737 (patch) | |
| tree | 08d9498f7b979a9d8ecec28b912cb354475556b8 | |
| parent | [media] dvb: get rid of enum dmx_success (diff) | |
| download | kernel-qcow2-linux-0693bdf75469487812da7c09949b09ad0396a737.tar.gz kernel-qcow2-linux-0693bdf75469487812da7c09949b09ad0396a737.tar.xz kernel-qcow2-linux-0693bdf75469487812da7c09949b09ad0396a737.zip | |
[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>
| -rw-r--r-- | Documentation/DocBook/media/dvb/kdapi.xml | 13 | ||||
| -rw-r--r-- | drivers/media/dvb-core/demux.h | 7 |
2 files changed, 4 insertions, 16 deletions
diff --git a/Documentation/DocBook/media/dvb/kdapi.xml b/Documentation/DocBook/media/dvb/kdapi.xml index 1acae6730151..ff133a326d50 100644 --- 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 2d036b36f551..15b79bdee465 100644 --- 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 { |