Commit 5d2cd163 authored by Andreas Oberritter's avatar Andreas Oberritter Committed by Linus Torvalds
Browse files

[PATCH] dvb: core: dvb_demux: remove more unused cruft 



Removed more unused variables and constants.

Signed-off-by: default avatarAndreas Oberritter <obi@linuxtv.org>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 218721b8

drivers/media/dvb/dvb-core/demux.h

+0 −7
Original line number Diff line number Diff line
@@ -125,9 +125,7 @@ struct dmx_ts_feed { 
		    u16 pid,

		    int type,

		    enum dmx_ts_pes pes_type,

		    size_t callback_length,

		    size_t circular_buffer_size,

		    int descramble,

		    struct timespec timeout);

        int (*start_filtering) (struct dmx_ts_feed* feed);

        int (*stop_filtering) (struct dmx_ts_feed* feed);
@@ -160,7 +158,6 @@ struct dmx_section_feed { 
        int (*set) (struct dmx_section_feed* feed,

		    u16 pid,

		    size_t circular_buffer_size,

		    int descramble,

		    int check_crc);

        int (*allocate_filter) (struct dmx_section_feed* feed,

				struct dmx_section_filter** filter);
@@ -208,7 +205,6 @@ struct dmx_frontend { 
        struct list_head connectivity_list; /* List of front-ends that can

					       be connected to a particular

					       demux */

        void* priv;     /* Pointer to private data of the API client */

        enum dmx_frontend_source source;

};
@@ -226,8 +222,6 @@ struct dmx_frontend { 
#define DMX_MEMORY_BASED_FILTERING              8    /* write() available */

#define DMX_CRC_CHECKING                        16

#define DMX_TS_DESCRAMBLING                     32

#define DMX_SECTION_PAYLOAD_DESCRAMBLING        64

#define DMX_MAC_ADDRESS_DESCRAMBLING            128



/*

 * Demux resource type identifier.
@@ -246,7 +240,6 @@ struct dmx_demux { 
        u32 capabilities;            /* Bitfield of capability flags */

        struct dmx_frontend* frontend;    /* Front-end connected to the demux */

        void* priv;                  /* Pointer to private data of the API client */

        int users;                   /* Number of users */

        int (*open) (struct dmx_demux* demux);

        int (*close) (struct dmx_demux* demux);

        int (*write) (struct dmx_demux* demux, const char* buf, size_t count);

drivers/media/dvb/dvb-core/dmxdev.c

+2 −2
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter) 
				return ret;

			}



			ret=(*secfeed)->set(*secfeed, para->pid, 32768, 0,

			ret=(*secfeed)->set(*secfeed, para->pid, 32768,

					    (para->flags & DMX_CHECK_CRC) ? 1 : 0);



			if (ret<0) {
@@ -654,7 +654,7 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter) 
		(*tsfeed)->priv = (void *) filter;



		ret = (*tsfeed)->set(*tsfeed, para->pid, ts_type, ts_pes,

				     188, 32768, 0, timeout);

				     32768, timeout);



		if (ret < 0) {

			dmxdev->demux->release_ts_feed(dmxdev->demux, *tsfeed);

drivers/media/dvb/dvb-core/dvb_demux.c

+2 −16
Original line number Diff line number Diff line
@@ -577,8 +577,7 @@ static void dvb_demux_feed_del(struct dvb_demux_feed *feed) 
}



static int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,

		     enum dmx_ts_pes pes_type, size_t callback_length,

		     size_t circular_buffer_size, int descramble,

		     enum dmx_ts_pes pes_type, size_t circular_buffer_size,

		     struct timespec timeout)

{

	struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
@@ -610,17 +609,10 @@ static int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type, 


	feed->pid = pid;

	feed->buffer_size = circular_buffer_size;

	feed->descramble = descramble;

	feed->timeout = timeout;

	feed->cb_length = callback_length;

	feed->ts_type = ts_type;

	feed->pes_type = pes_type;



	if (feed->descramble) {

		up(&demux->mutex);

		return -ENOSYS;

	}



	if (feed->buffer_size) {

#ifdef NOBUFS

		feed->buffer=NULL;
@@ -819,7 +811,7 @@ static int dmx_section_feed_allocate_filter(struct dmx_section_feed* feed, 


static int dmx_section_feed_set(struct dmx_section_feed* feed,

			 u16 pid, size_t circular_buffer_size,

			 int descramble, int check_crc)

			 int check_crc)

{

	struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) feed;

	struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
@@ -834,12 +826,6 @@ static int dmx_section_feed_set(struct dmx_section_feed* feed, 


	dvbdmxfeed->pid = pid;

	dvbdmxfeed->buffer_size = circular_buffer_size;

	dvbdmxfeed->descramble = descramble;

	if (dvbdmxfeed->descramble) {

		up(&dvbdmx->mutex);

		return -ENOSYS;

	}



	dvbdmxfeed->feed.sec.check_crc = check_crc;



#ifdef NOBUFS

drivers/media/dvb/dvb-core/dvb_demux.h

+1 −6
Original line number Diff line number Diff line
@@ -54,12 +54,9 @@ struct dvb_demux_filter { 
        int index;

        int state;

        int type;

	int pesto;



        u16 handle;

        u16 hw_handle;

        struct timer_list timer;

	int ts_state;

};
@@ -83,11 +80,9 @@ struct dvb_demux_feed { 
        u16 pid;

        u8 *buffer;

        int buffer_size;

        int descramble;



        struct timespec timeout;

        struct dvb_demux_filter *filter;

        int cb_length;



        int ts_type;

        enum dmx_ts_pes pes_type;
@@ -98,7 +93,7 @@ struct dvb_demux_feed { 
        u16 peslen;



	struct list_head list_head;

		int index; /* a unique index for each feed (can be used as hardware pid filter index) */

	unsigned int index; /* a unique index for each feed (can be used as hardware pid filter index) */

};



struct dvb_demux {

drivers/media/dvb/dvb-core/dvb_net.c

+1 −3
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ static int dvb_net_feed_start(struct net_device *dev) 
			return ret;

		}



		ret = priv->secfeed->set(priv->secfeed, priv->pid, 32768, 0, 1);

		ret = priv->secfeed->set(priv->secfeed, priv->pid, 32768, 1);



		if (ret<0) {

			printk("%s: could not set section feed\n", dev->name);
@@ -955,9 +955,7 @@ static int dvb_net_feed_start(struct net_device *dev) 
		priv->tsfeed->priv = (void *)dev;

		ret = priv->tsfeed->set(priv->tsfeed, priv->pid,

					TS_PACKET, DMX_TS_PES_OTHER,

					188 * 100, /* nr. of bytes delivered per callback */

					32768,     /* circular buffer size */

					0,         /* descramble */

					timeout);



		if (ret < 0) {