V4L/DVB (3435): Remove 'pid' from struct dmxdev_filter

The PID value is already stored in struct dmx_sct_filter_params which is
a member of struct dmxdev_filter.
Acked-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 4c52c8521bd8538363397f4d82b41d11ae28c1d9..ab1aeb84c6817fcc4aa9b26b3a5140796396b0bc 100644 (file)
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -454,7 +454,7 @@ static int dvb_dmxdev_feed_restart(struct dmxdev_filter *filter)
        for (i=0; i<dmxdev->filternum; i++)
                if (dmxdev->filter[i].state>=DMXDEV_STATE_GO &&
                    dmxdev->filter[i].type==DMXDEV_TYPE_SEC &&
-                   dmxdev->filter[i].pid==pid) {
+                   dmxdev->filter[i].params.sec.pid==pid) {
                        dvb_dmxdev_feed_start(&dmxdev->filter[i]);
                        return 0;
                }
@@ -505,7 +505,6 @@ static inline int dvb_dmxdev_filter_reset(struct dmxdev_filter *dmxdevfilter)
                return 0;
 
        dmxdevfilter->type=DMXDEV_TYPE_NONE;
-       dmxdevfilter->pid=0xffff;
        dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_ALLOCATED);
        return 0;
 }
@@ -546,8 +545,8 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
                /* find active filter/feed with same PID */
                for (i=0; i<dmxdev->filternum; i++) {
                        if (dmxdev->filter[i].state >= DMXDEV_STATE_GO &&
-                           dmxdev->filter[i].pid == para->pid &&
-                           dmxdev->filter[i].type == DMXDEV_TYPE_SEC) {
+                           dmxdev->filter[i].type == DMXDEV_TYPE_SEC &&
+                           dmxdev->filter[i].params.sec.pid == para->pid) {
                                *secfeed = dmxdev->filter[i].feed.sec;
                                break;
                        }
@@ -756,7 +755,6 @@ static int dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
        dvb_dmxdev_filter_stop(dmxdevfilter);
 
        dmxdevfilter->type=DMXDEV_TYPE_SEC;
-       dmxdevfilter->pid=params->pid;
        memcpy(&dmxdevfilter->params.sec,
               params, sizeof(struct dmx_sct_filter_params));
        invert_mode(&dmxdevfilter->params.sec.filter);
@@ -778,7 +776,6 @@ static int dvb_dmxdev_pes_filter_set(struct dmxdev *dmxdev,
                return -EINVAL;
 
        dmxdevfilter->type=DMXDEV_TYPE_PES;
-       dmxdevfilter->pid=params->pid;
        memcpy(&dmxdevfilter->params, params, sizeof(struct dmx_pes_filter_params));
 
        dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_SET);

diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb/dvb-core/dmxdev.h
index fafdf476b23ad76958128ce71a03511dd4f3c532..4cb879435fdb792f884bd670ec4fb80cd18d4b16 100644 (file)
--- a/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/drivers/media/dvb/dvb-core/dmxdev.h
@@ -89,8 +89,6 @@ struct dmxdev_filter {
        struct timer_list timer;
        int todo;
        u8 secheader[3];
-
-       u16 pid;
 };