[media] demux.h: Remove duplicated enum

"enum dmx_ts_pes" and "typedef enum dmx_pes_type_t" are just the
same enum declared twice, since Kernel (2.6.12). There's no reason
to duplicate it there, and sparse complains about that:
	drivers/media/dvb-core/dmxdev.c:600:55: warning: mixing different enum types
So, remove the internal define, keeping just the external one.
Internally, use only "enum dmx_ts_pes", as it is too late to drop
dmx_pes_type_t from the userspace API.

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

diff --git a/drivers/media/dvb-core/demux.h b/drivers/media/dvb-core/demux.h
index eb91fd808c16307a9d7259f960ff89be70efbd96..833191bcd81077542b054e3989ee564c7afd3228 100644 (file)
--- a/drivers/media/dvb-core/demux.h
+++ b/drivers/media/dvb-core/demux.h
@@ -83,45 +83,6 @@ enum dmx_success {
 #define TS_DEMUX        8   /* in case TS_PACKET is set, send the TS to
                               the demux device, not to the dvr device */
 
-/* PES type for filters which write to built-in decoder */
-/* these should be kept identical to the types in dmx.h */
-
-enum dmx_ts_pes
-{  /* also send packets to decoder (if it exists) */
-       DMX_TS_PES_AUDIO0,
-       DMX_TS_PES_VIDEO0,
-       DMX_TS_PES_TELETEXT0,
-       DMX_TS_PES_SUBTITLE0,
-       DMX_TS_PES_PCR0,
-
-       DMX_TS_PES_AUDIO1,
-       DMX_TS_PES_VIDEO1,
-       DMX_TS_PES_TELETEXT1,
-       DMX_TS_PES_SUBTITLE1,
-       DMX_TS_PES_PCR1,
-
-       DMX_TS_PES_AUDIO2,
-       DMX_TS_PES_VIDEO2,
-       DMX_TS_PES_TELETEXT2,
-       DMX_TS_PES_SUBTITLE2,
-       DMX_TS_PES_PCR2,
-
-       DMX_TS_PES_AUDIO3,
-       DMX_TS_PES_VIDEO3,
-       DMX_TS_PES_TELETEXT3,
-       DMX_TS_PES_SUBTITLE3,
-       DMX_TS_PES_PCR3,
-
-       DMX_TS_PES_OTHER
-};
-
-#define DMX_TS_PES_AUDIO    DMX_TS_PES_AUDIO0
-#define DMX_TS_PES_VIDEO    DMX_TS_PES_VIDEO0
-#define DMX_TS_PES_TELETEXT DMX_TS_PES_TELETEXT0
-#define DMX_TS_PES_SUBTITLE DMX_TS_PES_SUBTITLE0
-#define DMX_TS_PES_PCR      DMX_TS_PES_PCR0
-
-
 struct dmx_ts_feed {
        int is_filtering; /* Set to non-zero when filtering in progress */
        struct dmx_demux *parent; /* Back-pointer */

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 8896993e631f759bc2f58df786075e593e3b4c10..a1a3a5159d71f1ffc3ab244232bf68b6877d5f50 100644 (file)
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -569,7 +569,7 @@ static int dvb_dmxdev_start_feed(struct dmxdev *dmxdev,
        dmx_output_t otype;
        int ret;
        int ts_type;
-       dmx_pes_type_t ts_pes;
+       enum dmx_ts_pes ts_pes;
        struct dmx_ts_feed *tsfeed;
 
        feed->ts = NULL;

diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c
index 71641b2dde6b5a1f1073ac4272647153252e85c2..3485655fa08297c1ea6d75e73e40c3b1797e676d 100644 (file)
--- a/drivers/media/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb-core/dvb_demux.c
@@ -674,7 +674,7 @@ static int dmx_ts_feed_set(struct dmx_ts_feed *ts_feed, u16 pid, int ts_type,
                return -ERESTARTSYS;
 
        if (ts_type & TS_DECODER) {
-               if (pes_type >= DMX_TS_PES_OTHER) {
+               if (pes_type >= DMX_PES_OTHER) {
                        mutex_unlock(&demux->mutex);
                        return -EINVAL;
                }
@@ -846,7 +846,7 @@ static int dvbdmx_release_ts_feed(struct dmx_demux *dmx,
 
        feed->pid = 0xffff;
 
-       if (feed->ts_type & TS_DECODER && feed->pes_type < DMX_TS_PES_OTHER)
+       if (feed->ts_type & TS_DECODER && feed->pes_type < DMX_PES_OTHER)
                demux->pesfilter[feed->pes_type] = NULL;
 
        mutex_unlock(&demux->mutex);
@@ -1268,7 +1268,7 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux)
 
        INIT_LIST_HEAD(&dvbdemux->frontend_list);
 
-       for (i = 0; i < DMX_TS_PES_OTHER; i++) {
+       for (i = 0; i < DMX_PES_OTHER; i++) {
                dvbdemux->pesfilter[i] = NULL;
                dvbdemux->pids[i] = 0xffff;
        }

diff --git a/drivers/media/dvb-core/dvb_demux.h b/drivers/media/dvb-core/dvb_demux.h
index fa7188a253aa0add2f6275420391106ed51a6e83..ae7fc33c3231ec974a46d1275d38270e18b73827 100644 (file)
--- a/drivers/media/dvb-core/dvb_demux.h
+++ b/drivers/media/dvb-core/dvb_demux.h
@@ -119,8 +119,8 @@ struct dvb_demux {
 
        struct list_head frontend_list;
 
-       struct dvb_demux_feed *pesfilter[DMX_TS_PES_OTHER];
-       u16 pids[DMX_TS_PES_OTHER];
+       struct dvb_demux_feed *pesfilter[DMX_PES_OTHER];
+       u16 pids[DMX_PES_OTHER];
        int playing;
        int recording;
 

diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index 44225b186f6df4a42945a8f9998361558d470451..e17cb85d3ecfd67983b7e4051e42fc38eefcb759 100644 (file)
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -1044,7 +1044,7 @@ static int dvb_net_feed_start(struct net_device *dev)
                ret = priv->tsfeed->set(priv->tsfeed,
                                        priv->pid, /* pid */
                                        TS_PACKET, /* type */
-                                       DMX_TS_PES_OTHER, /* pes type */
+                                       DMX_PES_OTHER, /* pes type */
                                        32768,     /* circular buffer size */
                                        timeout    /* timeout */
                                        );

diff --git a/drivers/media/firewire/firedtv-dvb.c b/drivers/media/firewire/firedtv-dvb.c
index eb7496eab130cfb54d5daa39717e61ed3594a695..f710e17953e334dbf3de7c42fe57b5cbf16579f6 100644 (file)
--- a/drivers/media/firewire/firedtv-dvb.c
+++ b/drivers/media/firewire/firedtv-dvb.c
@@ -71,11 +71,11 @@ int fdtv_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 
        if (dvbdmxfeed->type == DMX_TYPE_TS) {
                switch (dvbdmxfeed->pes_type) {
-               case DMX_TS_PES_VIDEO:
-               case DMX_TS_PES_AUDIO:
-               case DMX_TS_PES_TELETEXT:
-               case DMX_TS_PES_PCR:
-               case DMX_TS_PES_OTHER:
+               case DMX_PES_VIDEO:
+               case DMX_PES_AUDIO:
+               case DMX_PES_TELETEXT:
+               case DMX_PES_PCR:
+               case DMX_PES_OTHER:
                        c = alloc_channel(fdtv);
                        break;
                default:
@@ -132,7 +132,7 @@ int fdtv_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
              (demux->dmx.frontend->source != DMX_MEMORY_FE))) {
 
                if (dvbdmxfeed->ts_type & TS_DECODER) {
-                       if (dvbdmxfeed->pes_type >= DMX_TS_PES_OTHER ||
+                       if (dvbdmxfeed->pes_type >= DMX_PES_OTHER ||
                            !demux->pesfilter[dvbdmxfeed->pes_type])
                                return -EINVAL;
 
@@ -141,7 +141,7 @@ int fdtv_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
                }
 
                if (!(dvbdmxfeed->ts_type & TS_DECODER &&
-                     dvbdmxfeed->pes_type < DMX_TS_PES_OTHER))
+                     dvbdmxfeed->pes_type < DMX_PES_OTHER))
                        return 0;
        }
 

diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c
index 3dc7aa9b6f407ff58a673a7a957ec28f33a0fa81..f38329d29daa8c41a83823deb0d2f87de7a079ff 100644 (file)
--- a/drivers/media/pci/ttpci/av7110.c
+++ b/drivers/media/pci/ttpci/av7110.c
@@ -990,7 +990,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)
 
        if (feed->type == DMX_TYPE_TS) {
                if ((feed->ts_type & TS_DECODER) &&
-                   (feed->pes_type <= DMX_TS_PES_PCR)) {
+                   (feed->pes_type <= DMX_PES_PCR)) {
                        switch (demux->dmx.frontend->source) {
                        case DMX_MEMORY_FE:
                                if (feed->ts_type & TS_DECODER)
@@ -1051,14 +1051,14 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed)
 
        if (feed->type == DMX_TYPE_TS) {
                if (feed->ts_type & TS_DECODER) {
-                       if (feed->pes_type >= DMX_TS_PES_OTHER ||
+                       if (feed->pes_type >= DMX_PES_OTHER ||
                            !demux->pesfilter[feed->pes_type])
                                return -EINVAL;
                        demux->pids[feed->pes_type] |= 0x8000;
                        demux->pesfilter[feed->pes_type] = NULL;
                }
                if (feed->ts_type & TS_DECODER &&
-                   feed->pes_type < DMX_TS_PES_OTHER) {
+                   feed->pes_type < DMX_PES_OTHER) {
                        ret = dvb_feed_stop_pid(feed);
                } else
                        if ((feed->ts_type & TS_PACKET) &&

diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
index e407185528504b61704113ccb0b8f97be3c367a1..21b9049c7b3fa111fbedb61b71782f7e699651c5 100644 (file)
--- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
@@ -930,11 +930,11 @@ static int ttusb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 
        if (dvbdmxfeed->type == DMX_TYPE_TS) {
                switch (dvbdmxfeed->pes_type) {
-               case DMX_TS_PES_VIDEO:
-               case DMX_TS_PES_AUDIO:
-               case DMX_TS_PES_TELETEXT:
-               case DMX_TS_PES_PCR:
-               case DMX_TS_PES_OTHER:
+               case DMX_PES_VIDEO:
+               case DMX_PES_AUDIO:
+               case DMX_PES_TELETEXT:
+               case DMX_PES_PCR:
+               case DMX_PES_OTHER:
                        break;
                default:
                        return -EINVAL;

diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index 504c81230339f60bbd859daac00eacf76430d15a..e52c3b97f304d9b2dfcb1e32bb9a24a3c08f45c6 100644 (file)
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -951,34 +951,34 @@ static int ttusb_dec_start_ts_feed(struct dvb_demux_feed *dvbdmxfeed)
 
        switch (dvbdmxfeed->pes_type) {
 
-       case DMX_TS_PES_VIDEO:
-               dprintk("  pes_type: DMX_TS_PES_VIDEO\n");
+       case DMX_PES_VIDEO:
+               dprintk("  pes_type: DMX_PES_VIDEO\n");
                dec->pid[DMX_PES_PCR] = dvbdmxfeed->pid;
                dec->pid[DMX_PES_VIDEO] = dvbdmxfeed->pid;
                dec->video_filter = dvbdmxfeed->filter;
                ttusb_dec_set_pids(dec);
                break;
 
-       case DMX_TS_PES_AUDIO:
-               dprintk("  pes_type: DMX_TS_PES_AUDIO\n");
+       case DMX_PES_AUDIO:
+               dprintk("  pes_type: DMX_PES_AUDIO\n");
                dec->pid[DMX_PES_AUDIO] = dvbdmxfeed->pid;
                dec->audio_filter = dvbdmxfeed->filter;
                ttusb_dec_set_pids(dec);
                break;
 
-       case DMX_TS_PES_TELETEXT:
+       case DMX_PES_TELETEXT:
                dec->pid[DMX_PES_TELETEXT] = dvbdmxfeed->pid;
-               dprintk("  pes_type: DMX_TS_PES_TELETEXT(not supported)\n");
+               dprintk("  pes_type: DMX_PES_TELETEXT(not supported)\n");
                return -ENOSYS;
 
-       case DMX_TS_PES_PCR:
-               dprintk("  pes_type: DMX_TS_PES_PCR\n");
+       case DMX_PES_PCR:
+               dprintk("  pes_type: DMX_PES_PCR\n");
                dec->pid[DMX_PES_PCR] = dvbdmxfeed->pid;
                ttusb_dec_set_pids(dec);
                break;
 
-       case DMX_TS_PES_OTHER:
-               dprintk("  pes_type: DMX_TS_PES_OTHER(not supported)\n");
+       case DMX_PES_OTHER:
+               dprintk("  pes_type: DMX_PES_OTHER(not supported)\n");
                return -ENOSYS;
 
        default:

diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h
index b2a9ad8cafdca731994e83af96bb5bd9410b84fd..b4fb650d9d4f361966e1620e3b5859e185f67028 100644 (file)
--- a/include/uapi/linux/dvb/dmx.h
+++ b/include/uapi/linux/dvb/dmx.h
@@ -51,7 +51,7 @@ typedef enum
 } dmx_input_t;
 
 
-typedef enum
+typedef enum dmx_ts_pes
 {
        DMX_PES_AUDIO0,
        DMX_PES_VIDEO0,