Commit c1dd11ec authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sparse: drivers/media NULL noise removal

parent 6a3643ed
...@@ -208,7 +208,7 @@ static int flex_i2c_write4(struct adapter *adapter, u32 device, u32 chip_addr, u ...@@ -208,7 +208,7 @@ static int flex_i2c_write4(struct adapter *adapter, u32 device, u32 chip_addr, u
i2c_main_setup(device, chip_addr, 0, addr, buf[0], len, &command); i2c_main_setup(device, chip_addr, 0, addr, buf[0], len, &command);
return i2c_main_write_for_flex2(adapter, command, 0, 100000); return i2c_main_write_for_flex2(adapter, command, NULL, 100000);
} }
static void fixchipaddr(u32 device, u32 bus, u32 addr, u32 *ret) static void fixchipaddr(u32 device, u32 bus, u32 addr, u32 *ret)
...@@ -1681,7 +1681,7 @@ static void init_dma_queue(struct adapter *adapter) ...@@ -1681,7 +1681,7 @@ static void init_dma_queue(struct adapter *adapter)
adapter->dmaq1.head = 0; adapter->dmaq1.head = 0;
adapter->dmaq1.tail = 0; adapter->dmaq1.tail = 0;
adapter->dmaq1.buffer = 0; adapter->dmaq1.buffer = NULL;
adapter->dmaq1.buffer = pci_alloc_consistent(adapter->pdev, SIZE_OF_BUF_DMA1 + 0x80, &dma_addr); adapter->dmaq1.buffer = pci_alloc_consistent(adapter->pdev, SIZE_OF_BUF_DMA1 + 0x80, &dma_addr);
...@@ -1707,7 +1707,7 @@ static void init_dma_queue(struct adapter *adapter) ...@@ -1707,7 +1707,7 @@ static void init_dma_queue(struct adapter *adapter)
adapter->dmaq2.head = 0; adapter->dmaq2.head = 0;
adapter->dmaq2.tail = 0; adapter->dmaq2.tail = 0;
adapter->dmaq2.buffer = 0; adapter->dmaq2.buffer = NULL;
adapter->dmaq2.buffer = pci_alloc_consistent(adapter->pdev, SIZE_OF_BUF_DMA2 + 0x80, &dma_addr); adapter->dmaq2.buffer = pci_alloc_consistent(adapter->pdev, SIZE_OF_BUF_DMA2 + 0x80, &dma_addr);
...@@ -1738,7 +1738,7 @@ static void free_dma_queue(struct adapter *adapter) ...@@ -1738,7 +1738,7 @@ static void free_dma_queue(struct adapter *adapter)
adapter->dmaq1.head = 0; adapter->dmaq1.head = 0;
adapter->dmaq1.tail = 0; adapter->dmaq1.tail = 0;
adapter->dmaq1.buffer_size = 0; adapter->dmaq1.buffer_size = 0;
adapter->dmaq1.buffer = 0; adapter->dmaq1.buffer = NULL;
} }
if (adapter->dmaq2.buffer != 0) { if (adapter->dmaq2.buffer != 0) {
...@@ -1748,7 +1748,7 @@ static void free_dma_queue(struct adapter *adapter) ...@@ -1748,7 +1748,7 @@ static void free_dma_queue(struct adapter *adapter)
adapter->dmaq2.head = 0; adapter->dmaq2.head = 0;
adapter->dmaq2.tail = 0; adapter->dmaq2.tail = 0;
adapter->dmaq2.buffer_size = 0; adapter->dmaq2.buffer_size = 0;
adapter->dmaq2.buffer = 0; adapter->dmaq2.buffer = NULL;
} }
} }
...@@ -2272,7 +2272,7 @@ static int skystar2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2272,7 +2272,7 @@ static int skystar2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
dvbdemux->feednum = N_PID_SLOTS; dvbdemux->feednum = N_PID_SLOTS;
dvbdemux->start_feed = dvb_start_feed; dvbdemux->start_feed = dvb_start_feed;
dvbdemux->stop_feed = dvb_stop_feed; dvbdemux->stop_feed = dvb_stop_feed;
dvbdemux->write_to_decoder = 0; dvbdemux->write_to_decoder = NULL;
dvbdemux->dmx.capabilities = (DMX_TS_FILTERING | DMX_SECTION_FILTERING | DMX_MEMORY_BASED_FILTERING); dvbdemux->dmx.capabilities = (DMX_TS_FILTERING | DMX_SECTION_FILTERING | DMX_MEMORY_BASED_FILTERING);
dvb_dmx_init(&adapter->demux); dvb_dmx_init(&adapter->demux);
......
...@@ -205,7 +205,7 @@ static struct dvb_bt8xx_card *dvb_bt8xx_find_by_pci(struct i2c_adapter *adap) ...@@ -205,7 +205,7 @@ static struct dvb_bt8xx_card *dvb_bt8xx_find_by_pci(struct i2c_adapter *adap)
if (NULL == dev) { if (NULL == dev) {
/* shoudn't happen with 2.6.0-test7 + newer */ /* shoudn't happen with 2.6.0-test7 + newer */
printk("attach: Huh? i2c adapter not in sysfs tree?\n"); printk("attach: Huh? i2c adapter not in sysfs tree?\n");
return 0; return NULL;
} }
pci = to_pci_dev(dev); pci = to_pci_dev(dev);
list_for_each(item, &card_list) { list_for_each(item, &card_list) {
......
...@@ -54,7 +54,7 @@ dvb_dmxdev_file_to_dvr(struct dmxdev *dmxdev, struct file *file) ...@@ -54,7 +54,7 @@ dvb_dmxdev_file_to_dvr(struct dmxdev *dmxdev, struct file *file)
static inline void dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer) static inline void dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer)
{ {
buffer->data=0; buffer->data=NULL;
buffer->size=8192; buffer->size=8192;
buffer->pread=0; buffer->pread=0;
buffer->pwrite=0; buffer->pwrite=0;
...@@ -162,12 +162,12 @@ static struct dmx_frontend * get_fe(struct dmx_demux *demux, int type) ...@@ -162,12 +162,12 @@ static struct dmx_frontend * get_fe(struct dmx_demux *demux, int type)
head=demux->get_frontends(demux); head=demux->get_frontends(demux);
if (!head) if (!head)
return 0; return NULL;
list_for_each(pos, head) list_for_each(pos, head)
if (DMX_FE_ENTRY(pos)->source==type) if (DMX_FE_ENTRY(pos)->source==type)
return DMX_FE_ENTRY(pos); return DMX_FE_ENTRY(pos);
return 0; return NULL;
} }
static inline void dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int state) static inline void dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int state)
...@@ -244,7 +244,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file) ...@@ -244,7 +244,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file)
void *mem=dmxdev->dvr_buffer.data; void *mem=dmxdev->dvr_buffer.data;
mb(); mb();
spin_lock_irq(&dmxdev->lock); spin_lock_irq(&dmxdev->lock);
dmxdev->dvr_buffer.data=0; dmxdev->dvr_buffer.data=NULL;
spin_unlock_irq(&dmxdev->lock); spin_unlock_irq(&dmxdev->lock);
vfree(mem); vfree(mem);
} }
...@@ -304,7 +304,7 @@ static int dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsign ...@@ -304,7 +304,7 @@ static int dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsign
return -EBUSY; return -EBUSY;
spin_lock_irq(&dmxdevfilter->dev->lock); spin_lock_irq(&dmxdevfilter->dev->lock);
mem=buf->data; mem=buf->data;
buf->data=0; buf->data=NULL;
buf->size=size; buf->size=size;
buf->pwrite=buf->pread=0; buf->pwrite=buf->pread=0;
spin_unlock_irq(&dmxdevfilter->dev->lock); spin_unlock_irq(&dmxdevfilter->dev->lock);
...@@ -497,7 +497,7 @@ static int dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter) ...@@ -497,7 +497,7 @@ static int dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
release_filter(dmxdevfilter->feed.sec, release_filter(dmxdevfilter->feed.sec,
dmxdevfilter->filter.sec); dmxdevfilter->filter.sec);
dvb_dmxdev_feed_restart(dmxdevfilter); dvb_dmxdev_feed_restart(dmxdevfilter);
dmxdevfilter->feed.sec=0; dmxdevfilter->feed.sec=NULL;
break; break;
case DMXDEV_TYPE_PES: case DMXDEV_TYPE_PES:
if (!dmxdevfilter->feed.ts) if (!dmxdevfilter->feed.ts)
...@@ -506,7 +506,7 @@ static int dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter) ...@@ -506,7 +506,7 @@ static int dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
dmxdevfilter->dev->demux-> dmxdevfilter->dev->demux->
release_ts_feed(dmxdevfilter->dev->demux, release_ts_feed(dmxdevfilter->dev->demux,
dmxdevfilter->feed.ts); dmxdevfilter->feed.ts);
dmxdevfilter->feed.ts=0; dmxdevfilter->feed.ts=NULL;
break; break;
default: default:
if (dmxdevfilter->state==DMXDEV_STATE_ALLOCATED) if (dmxdevfilter->state==DMXDEV_STATE_ALLOCATED)
...@@ -558,8 +558,8 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter) ...@@ -558,8 +558,8 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
struct dmx_section_filter **secfilter=&filter->filter.sec; struct dmx_section_filter **secfilter=&filter->filter.sec;
struct dmx_section_feed **secfeed=&filter->feed.sec; struct dmx_section_feed **secfeed=&filter->feed.sec;
*secfilter=0; *secfilter=NULL;
*secfeed=0; *secfeed=NULL;
/* find active filter/feed with same PID */ /* find active filter/feed with same PID */
for (i=0; i<dmxdev->filternum; i++) { for (i=0; i<dmxdev->filternum; i++) {
...@@ -640,7 +640,7 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter) ...@@ -640,7 +640,7 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
enum dmx_ts_pes ts_pes; enum dmx_ts_pes ts_pes;
struct dmx_ts_feed **tsfeed = &filter->feed.ts; struct dmx_ts_feed **tsfeed = &filter->feed.ts;
filter->feed.ts = 0; filter->feed.ts = NULL;
otype=para->output; otype=para->output;
ts_pes=(enum dmx_ts_pes) para->pes_type; ts_pes=(enum dmx_ts_pes) para->pes_type;
...@@ -717,7 +717,7 @@ static int dvb_demux_open(struct inode *inode, struct file *file) ...@@ -717,7 +717,7 @@ static int dvb_demux_open(struct inode *inode, struct file *file)
dvb_dmxdev_buffer_init(&dmxdevfilter->buffer); dvb_dmxdev_buffer_init(&dmxdevfilter->buffer);
dmxdevfilter->type=DMXDEV_TYPE_NONE; dmxdevfilter->type=DMXDEV_TYPE_NONE;
dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_ALLOCATED); dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_ALLOCATED);
dmxdevfilter->feed.ts=0; dmxdevfilter->feed.ts=NULL;
init_timer(&dmxdevfilter->timer); init_timer(&dmxdevfilter->timer);
up(&dmxdev->mutex); up(&dmxdev->mutex);
...@@ -742,7 +742,7 @@ static int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *d ...@@ -742,7 +742,7 @@ static int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *d
void *mem=dmxdevfilter->buffer.data; void *mem=dmxdevfilter->buffer.data;
spin_lock_irq(&dmxdev->lock); spin_lock_irq(&dmxdev->lock);
dmxdevfilter->buffer.data=0; dmxdevfilter->buffer.data=NULL;
spin_unlock_irq(&dmxdev->lock); spin_unlock_irq(&dmxdev->lock);
vfree(mem); vfree(mem);
} }
...@@ -1006,7 +1006,7 @@ static struct file_operations dvb_demux_fops = { ...@@ -1006,7 +1006,7 @@ static struct file_operations dvb_demux_fops = {
}; };
static struct dvb_device dvbdev_demux = { static struct dvb_device dvbdev_demux = {
.priv = 0, .priv = NULL,
.users = 1, .users = 1,
.writers = 1, .writers = 1,
.fops = &dvb_demux_fops .fops = &dvb_demux_fops
...@@ -1077,7 +1077,7 @@ static struct file_operations dvb_dvr_fops = { ...@@ -1077,7 +1077,7 @@ static struct file_operations dvb_dvr_fops = {
}; };
static struct dvb_device dvbdev_dvr = { static struct dvb_device dvbdev_dvr = {
.priv = 0, .priv = NULL,
.users = 1, .users = 1,
.writers = 1, .writers = 1,
.fops = &dvb_dvr_fops .fops = &dvb_dvr_fops
...@@ -1106,10 +1106,10 @@ dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter) ...@@ -1106,10 +1106,10 @@ dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter)
spin_lock_init(&dmxdev->lock); spin_lock_init(&dmxdev->lock);
for (i=0; i<dmxdev->filternum; i++) { for (i=0; i<dmxdev->filternum; i++) {
dmxdev->filter[i].dev=dmxdev; dmxdev->filter[i].dev=dmxdev;
dmxdev->filter[i].buffer.data=0; dmxdev->filter[i].buffer.data=NULL;
dvb_dmxdev_filter_state_set(&dmxdev->filter[i], DMXDEV_STATE_FREE); dvb_dmxdev_filter_state_set(&dmxdev->filter[i], DMXDEV_STATE_FREE);
dmxdev->dvr[i].dev=dmxdev; dmxdev->dvr[i].dev=dmxdev;
dmxdev->dvr[i].buffer.data=0; dmxdev->dvr[i].buffer.data=NULL;
dvb_dmxdev_filter_state_set(&dmxdev->filter[i], DMXDEV_STATE_FREE); dvb_dmxdev_filter_state_set(&dmxdev->filter[i], DMXDEV_STATE_FREE);
dvb_dmxdev_dvr_state_set(&dmxdev->dvr[i], DMXDEV_STATE_FREE); dvb_dmxdev_dvr_state_set(&dmxdev->dvr[i], DMXDEV_STATE_FREE);
} }
...@@ -1128,11 +1128,11 @@ dvb_dmxdev_release(struct dmxdev *dmxdev) ...@@ -1128,11 +1128,11 @@ dvb_dmxdev_release(struct dmxdev *dmxdev)
dvb_unregister_device(dmxdev->dvr_dvbdev); dvb_unregister_device(dmxdev->dvr_dvbdev);
if (dmxdev->filter) { if (dmxdev->filter) {
vfree(dmxdev->filter); vfree(dmxdev->filter);
dmxdev->filter=0; dmxdev->filter=NULL;
} }
if (dmxdev->dvr) { if (dmxdev->dvr) {
vfree(dmxdev->dvr); vfree(dmxdev->dvr);
dmxdev->dvr=0; dmxdev->dvr=NULL;
} }
dmxdev->demux->close(dmxdev->demux); dmxdev->demux->close(dmxdev->demux);
} }
......
...@@ -1494,7 +1494,7 @@ static struct file_operations dvb_ca_fops = { ...@@ -1494,7 +1494,7 @@ static struct file_operations dvb_ca_fops = {
}; };
static struct dvb_device dvbdev_ca = { static struct dvb_device dvbdev_ca = {
priv: 0, priv: NULL,
users: 1, users: 1,
readers: 1, readers: 1,
writers: 1, writers: 1,
......
...@@ -160,7 +160,7 @@ static inline int dvb_dmx_swfilter_payload (struct dvb_demux_feed *feed, const u ...@@ -160,7 +160,7 @@ static inline int dvb_dmx_swfilter_payload (struct dvb_demux_feed *feed, const u
feed->peslen += count; feed->peslen += count;
return feed->cb.ts (&buf[p], count, 0, 0, &feed->feed.ts, DMX_OK); return feed->cb.ts (&buf[p], count, NULL, 0, &feed->feed.ts, DMX_OK);
} }
...@@ -183,7 +183,7 @@ static int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed, ...@@ -183,7 +183,7 @@ static int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed,
return 0; return 0;
return feed->cb.sec (feed->feed.sec.secbuf, feed->feed.sec.seclen, return feed->cb.sec (feed->feed.sec.secbuf, feed->feed.sec.seclen,
0, 0, &f->filter, DMX_OK); NULL, 0, &f->filter, DMX_OK);
} }
...@@ -373,7 +373,7 @@ static inline void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed, con ...@@ -373,7 +373,7 @@ static inline void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed, con
if (feed->ts_type & TS_PAYLOAD_ONLY) if (feed->ts_type & TS_PAYLOAD_ONLY)
dvb_dmx_swfilter_payload(feed, buf); dvb_dmx_swfilter_payload(feed, buf);
else else
feed->cb.ts(buf, 188, 0, 0, &feed->feed.ts, DMX_OK); feed->cb.ts(buf, 188, NULL, 0, &feed->feed.ts, DMX_OK);
} }
if (feed->ts_type & TS_DECODER) if (feed->ts_type & TS_DECODER)
if (feed->demux->write_to_decoder) if (feed->demux->write_to_decoder)
...@@ -422,7 +422,7 @@ void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) ...@@ -422,7 +422,7 @@ void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
} }
if (feed->pid == 0x2000) if (feed->pid == 0x2000)
feed->cb.ts(buf, 188, 0, 0, &feed->feed.ts, DMX_OK); feed->cb.ts(buf, 188, NULL, 0, &feed->feed.ts, DMX_OK);
} }
} }
...@@ -637,7 +637,7 @@ static int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type, ...@@ -637,7 +637,7 @@ static int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,
if (feed->buffer_size) { if (feed->buffer_size) {
#ifdef NOBUFS #ifdef NOBUFS
feed->buffer=0; feed->buffer=NULL;
#else #else
feed->buffer = vmalloc(feed->buffer_size); feed->buffer = vmalloc(feed->buffer_size);
if (!feed->buffer) { if (!feed->buffer) {
...@@ -736,11 +736,11 @@ static int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed ** ...@@ -736,11 +736,11 @@ static int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed **
feed->demux = demux; feed->demux = demux;
feed->pid = 0xffff; feed->pid = 0xffff;
feed->peslen = 0xfffa; feed->peslen = 0xfffa;
feed->buffer = 0; feed->buffer = NULL;
(*ts_feed) = &feed->feed.ts; (*ts_feed) = &feed->feed.ts;
(*ts_feed)->parent = dmx; (*ts_feed)->parent = dmx;
(*ts_feed)->priv = 0; (*ts_feed)->priv = NULL;
(*ts_feed)->is_filtering = 0; (*ts_feed)->is_filtering = 0;
(*ts_feed)->start_filtering = dmx_ts_feed_start_filtering; (*ts_feed)->start_filtering = dmx_ts_feed_start_filtering;
(*ts_feed)->stop_filtering = dmx_ts_feed_stop_filtering; (*ts_feed)->stop_filtering = dmx_ts_feed_stop_filtering;
...@@ -820,7 +820,7 @@ static int dmx_section_feed_allocate_filter(struct dmx_section_feed* feed, ...@@ -820,7 +820,7 @@ static int dmx_section_feed_allocate_filter(struct dmx_section_feed* feed,
spin_lock_irq(&dvbdemux->lock); spin_lock_irq(&dvbdemux->lock);
*filter=&dvbdmxfilter->filter; *filter=&dvbdmxfilter->filter;
(*filter)->parent=feed; (*filter)->parent=feed;
(*filter)->priv=0; (*filter)->priv=NULL;
dvbdmxfilter->feed=dvbdmxfeed; dvbdmxfilter->feed=dvbdmxfeed;
dvbdmxfilter->type=DMX_TYPE_SEC; dvbdmxfilter->type=DMX_TYPE_SEC;
dvbdmxfilter->state=DMX_STATE_READY; dvbdmxfilter->state=DMX_STATE_READY;
...@@ -858,7 +858,7 @@ static int dmx_section_feed_set(struct dmx_section_feed* feed, ...@@ -858,7 +858,7 @@ static int dmx_section_feed_set(struct dmx_section_feed* feed,
dvbdmxfeed->feed.sec.check_crc=check_crc; dvbdmxfeed->feed.sec.check_crc=check_crc;
#ifdef NOBUFS #ifdef NOBUFS
dvbdmxfeed->buffer=0; dvbdmxfeed->buffer=NULL;
#else #else
dvbdmxfeed->buffer=vmalloc(dvbdmxfeed->buffer_size); dvbdmxfeed->buffer=vmalloc(dvbdmxfeed->buffer_size);
if (!dvbdmxfeed->buffer) { if (!dvbdmxfeed->buffer) {
...@@ -1015,13 +1015,13 @@ static int dvbdmx_allocate_section_feed(struct dmx_demux *demux, ...@@ -1015,13 +1015,13 @@ static int dvbdmx_allocate_section_feed(struct dmx_demux *demux,
dvbdmxfeed->feed.sec.secbuf = dvbdmxfeed->feed.sec.secbuf_base; dvbdmxfeed->feed.sec.secbuf = dvbdmxfeed->feed.sec.secbuf_base;
dvbdmxfeed->feed.sec.secbufp = dvbdmxfeed->feed.sec.seclen = 0; dvbdmxfeed->feed.sec.secbufp = dvbdmxfeed->feed.sec.seclen = 0;
dvbdmxfeed->feed.sec.tsfeedp = 0; dvbdmxfeed->feed.sec.tsfeedp = 0;
dvbdmxfeed->filter=0; dvbdmxfeed->filter=NULL;
dvbdmxfeed->buffer=0; dvbdmxfeed->buffer=NULL;
(*feed)=&dvbdmxfeed->feed.sec; (*feed)=&dvbdmxfeed->feed.sec;
(*feed)->is_filtering=0; (*feed)->is_filtering=0;
(*feed)->parent=demux; (*feed)->parent=demux;
(*feed)->priv=0; (*feed)->priv=NULL;
(*feed)->set=dmx_section_feed_set; (*feed)->set=dmx_section_feed_set;
(*feed)->allocate_filter=dmx_section_feed_allocate_filter; (*feed)->allocate_filter=dmx_section_feed_allocate_filter;
...@@ -1223,7 +1223,7 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux) ...@@ -1223,7 +1223,7 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux)
if (!dvbdemux->memcopy) if (!dvbdemux->memcopy)
dvbdemux->memcopy = dvb_dmx_memcopy; dvbdemux->memcopy = dvb_dmx_memcopy;
dmx->frontend=0; dmx->frontend=NULL;
dmx->reg_list.prev = dmx->reg_list.next = &dmx->reg_list; dmx->reg_list.prev = dmx->reg_list.next = &dmx->reg_list;
dmx->priv=(void *) dvbdemux; dmx->priv=(void *) dvbdemux;
dmx->open=dvbdmx_open; dmx->open=dvbdmx_open;
......
...@@ -677,7 +677,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev, ...@@ -677,7 +677,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev,
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv; struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
int ret; int ret;
*secfilter=0; *secfilter=NULL;
ret = priv->secfeed->allocate_filter(priv->secfeed, secfilter); ret = priv->secfeed->allocate_filter(priv->secfeed, secfilter);
if (ret<0) { if (ret<0) {
printk("%s: could not get filter\n", dev->name); printk("%s: could not get filter\n", dev->name);
...@@ -726,9 +726,9 @@ static int dvb_net_feed_start(struct net_device *dev) ...@@ -726,9 +726,9 @@ static int dvb_net_feed_start(struct net_device *dev)
if (priv->secfeed || priv->secfilter || priv->multi_secfilter[0]) if (priv->secfeed || priv->secfilter || priv->multi_secfilter[0])
printk("%s: BUG %d\n", __FUNCTION__, __LINE__); printk("%s: BUG %d\n", __FUNCTION__, __LINE__);
priv->secfeed=0; priv->secfeed=NULL;
priv->secfilter=0; priv->secfilter=NULL;
priv->tsfeed = 0; priv->tsfeed = NULL;
if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) { if (priv->feedtype == DVB_NET_FEEDTYPE_MPE) {
dprintk("%s: alloc secfeed\n", __FUNCTION__); dprintk("%s: alloc secfeed\n", __FUNCTION__);
...@@ -744,7 +744,7 @@ static int dvb_net_feed_start(struct net_device *dev) ...@@ -744,7 +744,7 @@ static int dvb_net_feed_start(struct net_device *dev)
if (ret<0) { if (ret<0) {
printk("%s: could not set section feed\n", dev->name); printk("%s: could not set section feed\n", dev->name);
priv->demux->release_section_feed(priv->demux, priv->secfeed); priv->demux->release_section_feed(priv->demux, priv->secfeed);
priv->secfeed=0; priv->secfeed=NULL;
return ret; return ret;
} }
...@@ -799,7 +799,7 @@ static int dvb_net_feed_start(struct net_device *dev) ...@@ -799,7 +799,7 @@ static int dvb_net_feed_start(struct net_device *dev)
if (ret < 0) { if (ret < 0) {
printk("%s: could not set ts feed\n", dev->name); printk("%s: could not set ts feed\n", dev->name);
priv->demux->release_ts_feed(priv->demux, priv->tsfeed); priv->demux->release_ts_feed(priv->demux, priv->tsfeed);
priv->tsfeed = 0; priv->tsfeed = NULL;
return ret; return ret;
} }
...@@ -828,7 +828,7 @@ static int dvb_net_feed_stop(struct net_device *dev) ...@@ -828,7 +828,7 @@ static int dvb_net_feed_stop(struct net_device *dev)
dprintk("%s: release secfilter\n", __FUNCTION__); dprintk("%s: release secfilter\n", __FUNCTION__);
priv->secfeed->release_filter(priv->secfeed, priv->secfeed->release_filter(priv->secfeed,
priv->secfilter); priv->secfilter);
priv->secfilter=0; priv->secfilter=NULL;
} }
for (i=0; i<priv->multi_num; i++) { for (i=0; i<priv->multi_num; i++) {
...@@ -837,12 +837,12 @@ static int dvb_net_feed_stop(struct net_device *dev) ...@@ -837,12 +837,12 @@ static int dvb_net_feed_stop(struct net_device *dev)
__FUNCTION__, i); __FUNCTION__, i);
priv->secfeed->release_filter(priv->secfeed, priv->secfeed->release_filter(priv->secfeed,
priv->multi_secfilter[i]); priv->multi_secfilter[i]);
priv->multi_secfilter[i]=0; priv->multi_secfilter[i]=NULL;
} }
} }
priv->demux->release_section_feed(priv->demux, priv->secfeed); priv->demux->release_section_feed(priv->demux, priv->secfeed);
priv->secfeed=0; priv->secfeed=NULL;
} else } else
printk("%s: no feed to stop\n", dev->name); printk("%s: no feed to stop\n", dev->name);
} else if (priv->feedtype == DVB_NET_FEEDTYPE_ULE) { } else if (priv->feedtype == DVB_NET_FEEDTYPE_ULE) {
...@@ -852,7 +852,7 @@ static int dvb_net_feed_stop(struct net_device *dev) ...@@ -852,7 +852,7 @@ static int dvb_net_feed_stop(struct net_device *dev)
priv->tsfeed->stop_filtering(priv->tsfeed); priv->tsfeed->stop_filtering(priv->tsfeed);
} }
priv->demux->release_ts_feed(priv->demux, priv->tsfeed); priv->demux->release_ts_feed(priv->demux, priv->tsfeed);
priv->tsfeed = 0; priv->tsfeed = NULL;
} }
else else
printk("%s: no ts feed to stop\n", dev->name); printk("%s: no ts feed to stop\n", dev->name);
...@@ -1178,16 +1178,13 @@ static int dvb_net_ioctl(struct inode *inode, struct file *file, ...@@ -1178,16 +1178,13 @@ static int dvb_net_ioctl(struct inode *inode, struct file *file,
static struct file_operations dvb_net_fops = { static struct file_operations dvb_net_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = 0,
.write = 0,
.ioctl = dvb_net_ioctl, .ioctl = dvb_net_ioctl,
.open = dvb_generic_open, .open = dvb_generic_open,
.release = dvb_generic_release, .release = dvb_generic_release,
.poll = 0,
}; };
static struct dvb_device dvbdev_net = { static struct dvb_device dvbdev_net = {
.priv = 0, .priv = NULL,
.users = 1, .users = 1,
.writers = 1, .writers = 1,
.fops = &dvb_net_fops, .fops = &dvb_net_fops,
......
...@@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, ...@@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
if ((id = dvbdev_get_free_id (adap, type)) < 0) { if ((id = dvbdev_get_free_id (adap, type)) < 0) {
up (&dvbdev_register_lock); up (&dvbdev_register_lock);
*pdvbdev = 0; *pdvbdev = NULL;
printk ("%s: could get find free device id...\n", __FUNCTION__); printk ("%s: could get find free device id...\n", __FUNCTION__);
return -ENFILE; return -ENFILE;
} }
......
...@@ -538,7 +538,7 @@ static int tda1004x_fwupload(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda ...@@ -538,7 +538,7 @@ static int tda1004x_fwupload(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda
static int tda10045h_init(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda_state) static int tda10045h_init(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda_state)
{ {
struct i2c_msg tuner_msg = {.addr = 0,.flags = 0,.buf = 0,.len = 0 }; struct i2c_msg tuner_msg = {.addr = 0,.flags = 0,.buf = NULL,.len = 0 };
static u8 disable_mc44BC374c[] = { 0x1d, 0x74, 0xa0, 0x68 }; static u8 disable_mc44BC374c[] = { 0x1d, 0x74, 0xa0, 0x68 };
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __FUNCTION__);
...@@ -576,7 +576,7 @@ static int tda10045h_init(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda_st ...@@ -576,7 +576,7 @@ static int tda10045h_init(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda_st
static int tda10046h_init(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda_state) static int tda10046h_init(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda_state)
{ {
struct i2c_msg tuner_msg = {.addr = 0,.flags = 0,.buf = 0,.len = 0 }; struct i2c_msg tuner_msg = {.addr = 0,.flags = 0,.buf = NULL,.len = 0 };
static u8 disable_mc44BC374c[] = { 0x1d, 0x74, 0xa0, 0x68 }; static u8 disable_mc44BC374c[] = { 0x1d, 0x74, 0xa0, 0x68 };
dprintk("%s\n", __FUNCTION__); dprintk("%s\n", __FUNCTION__);
...@@ -1393,7 +1393,7 @@ static int tda1004x_attach(struct dvb_i2c_bus *i2c, void **data) ...@@ -1393,7 +1393,7 @@ static int tda1004x_attach(struct dvb_i2c_bus *i2c, void **data)
int tuner_type = -1; int tuner_type = -1;
struct tda1004x_state tda_state; struct tda1004x_state tda_state;
struct tda1004x_state* ptda_state; struct tda1004x_state* ptda_state;
struct i2c_msg tuner_msg = {.addr=0, .flags=0, .buf=0, .len=0 }; struct i2c_msg tuner_msg = {.addr=0, .flags=0, .buf=NULL, .len=0 };
static u8 td1344_init[] = { 0x0b, 0xf5, 0x88, 0xab }; static u8 td1344_init[] = { 0x0b, 0xf5, 0x88, 0xab };
static u8 td1316_init[] = { 0x0b, 0xf5, 0x85, 0xab }; static u8 td1316_init[] = { 0x0b, 0xf5, 0x85, 0xab };
static u8 td1316_init_tda10046h[] = { 0x0b, 0xf5, 0x80, 0xab }; static u8 td1316_init_tda10046h[] = { 0x0b, 0xf5, 0x80, 0xab };
......
...@@ -320,7 +320,7 @@ static void debiirq (unsigned long data) ...@@ -320,7 +320,7 @@ static void debiirq (unsigned long data)
case DATA_PIPING: case DATA_PIPING:
if (av7110->handle2filter[handle]) if (av7110->handle2filter[handle])
DvbDmxFilterCallback((u8 *)av7110->debi_virt, DvbDmxFilterCallback((u8 *)av7110->debi_virt,
av7110->debilen, 0, 0, av7110->debilen, NULL, 0,
av7110->handle2filter[handle], av7110->handle2filter[handle],
DMX_OK, av7110); DMX_OK, av7110);
spin_lock(&av7110->debilock); spin_lock(&av7110->debilock);
...@@ -651,7 +651,7 @@ static struct file_operations dvb_osd_fops = { ...@@ -651,7 +651,7 @@ static struct file_operations dvb_osd_fops = {
}; };
static struct dvb_device dvbdev_osd = { static struct dvb_device dvbdev_osd = {
.priv = 0, .priv = NULL,
.users = 1, .users = 1,
.writers = 1, .writers = 1,
.fops = &dvb_osd_fops, .fops = &dvb_osd_fops,
...@@ -928,7 +928,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) ...@@ -928,7 +928,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed)
!demux->pesfilter[feed->pes_type]) !demux->pesfilter[feed->pes_type])
return -EINVAL; return -EINVAL;
demux->pids[feed->pes_type] |= 0x8000; demux->pids[feed->pes_type] |= 0x8000;
demux->pesfilter[feed->pes_type] = 0; demux->pesfilter[feed->pes_type] = NULL;
} }
if (feed->ts_type & TS_DECODER && if (feed->ts_type & TS_DECODER &&
feed->pes_type < DMX_TS_PES_OTHER) { feed->pes_type < DMX_TS_PES_OTHER) {
...@@ -1402,7 +1402,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d ...@@ -1402,7 +1402,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
/* ARM "watchdog" */ /* ARM "watchdog" */
init_waitqueue_head(&av7110->arm_wait); init_waitqueue_head(&av7110->arm_wait);
av7110->arm_thread=0; av7110->arm_thread=NULL;
/* allocate and init buffers */ /* allocate and init buffers */
av7110->debi_virt = pci_alloc_consistent(dev->pci, 8192, av7110->debi_virt = pci_alloc_consistent(dev->pci, 8192,
......
...@@ -109,7 +109,7 @@ int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len) ...@@ -109,7 +109,7 @@ int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len)
if (buf[3] == 0xe0) // video PES do not have a length in TS if (buf[3] == 0xe0) // video PES do not have a length in TS
buf[4] = buf[5] = 0; buf[4] = buf[5] = 0;
if (dvbdmxfeed->ts_type & TS_PAYLOAD_ONLY) if (dvbdmxfeed->ts_type & TS_PAYLOAD_ONLY)
return dvbdmxfeed->cb.ts(buf, len, 0, 0, return dvbdmxfeed->cb.ts(buf, len, NULL, 0,
&dvbdmxfeed->feed.ts, DMX_OK); &dvbdmxfeed->feed.ts, DMX_OK);
else else
return dvb_filter_pes2ts(p2t, buf, len, 1); return dvb_filter_pes2ts(p2t, buf, len, 1);
...@@ -121,7 +121,7 @@ static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data) ...@@ -121,7 +121,7 @@ static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
// DEB_EE(("dvb_demux_feed:%p\n", dvbdmxfeed)); // DEB_EE(("dvb_demux_feed:%p\n", dvbdmxfeed));
dvbdmxfeed->cb.ts(data, 188, 0, 0, dvbdmxfeed->cb.ts(data, 188, NULL, 0,
&dvbdmxfeed->feed.ts, DMX_OK); &dvbdmxfeed->feed.ts, DMX_OK);
return 0; return 0;
} }
...@@ -758,7 +758,7 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, ...@@ -758,7 +758,7 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter,
memcpy(obuf + l, buf + c, TS_SIZE - l); memcpy(obuf + l, buf + c, TS_SIZE - l);
c = length; c = length;
} }
feed->cb.ts(obuf, 188, 0, 0, &feed->feed.ts, DMX_OK); feed->cb.ts(obuf, 188, NULL, 0, &feed->feed.ts, DMX_OK);
pes_start = 0; pes_start = 0;
} }
} }
...@@ -1372,7 +1372,7 @@ static struct file_operations dvb_video_fops = { ...@@ -1372,7 +1372,7 @@ static struct file_operations dvb_video_fops = {
}; };
static struct dvb_device dvbdev_video = { static struct dvb_device dvbdev_video = {
.priv = 0, .priv = NULL,
.users = 6, .users = 6,
.readers = 5, /* arbitrary */ .readers = 5, /* arbitrary */
.writers = 1, .writers = 1,
...@@ -1390,7 +1390,7 @@ static struct file_operations dvb_audio_fops = { ...@@ -1390,7 +1390,7 @@ static struct file_operations dvb_audio_fops = {
}; };
static struct dvb_device dvbdev_audio = { static struct dvb_device dvbdev_audio = {
.priv = 0, .priv = NULL,
.users = 1, .users = 1,
.writers = 1, .writers = 1,
.fops = &dvb_audio_fops, .fops = &dvb_audio_fops,
......
...@@ -110,9 +110,9 @@ void ci_ll_flush(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *ciwbuf) ...@@ -110,9 +110,9 @@ void ci_ll_flush(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *ciwbuf)
void ci_ll_release(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *ciwbuf) void ci_ll_release(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *ciwbuf)
{ {
vfree(cirbuf->data); vfree(cirbuf->data);
cirbuf->data = 0; cirbuf->data = NULL;
vfree(ciwbuf->data); vfree(ciwbuf->data);
ciwbuf->data = 0; ciwbuf->data = NULL;
} }
int ci_ll_reset(struct dvb_ringbuffer *cibuf, struct file *file, int ci_ll_reset(struct dvb_ringbuffer *cibuf, struct file *file,
...@@ -350,7 +350,7 @@ static struct file_operations dvb_ca_fops = { ...@@ -350,7 +350,7 @@ static struct file_operations dvb_ca_fops = {
}; };
static struct dvb_device dvbdev_ca = { static struct dvb_device dvbdev_ca = {
.priv = 0, .priv = NULL,
.users = 1, .users = 1,
.writers = 1, .writers = 1,
.fops = &dvb_ca_fops, .fops = &dvb_ca_fops,
......
...@@ -1125,7 +1125,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i ...@@ -1125,7 +1125,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
ttusb->dvb_demux.dmx.capabilities = ttusb->dvb_demux.dmx.capabilities =
DMX_TS_FILTERING | DMX_SECTION_FILTERING; DMX_TS_FILTERING | DMX_SECTION_FILTERING;
ttusb->dvb_demux.priv = 0; ttusb->dvb_demux.priv = NULL;
#ifdef TTUSB_HWSECTIONS #ifdef TTUSB_HWSECTIONS
ttusb->dvb_demux.filternum = TTUSB_MAXFILTER; ttusb->dvb_demux.filternum = TTUSB_MAXFILTER;
#else #else
...@@ -1134,7 +1134,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i ...@@ -1134,7 +1134,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
ttusb->dvb_demux.feednum = TTUSB_MAXCHANNEL; ttusb->dvb_demux.feednum = TTUSB_MAXCHANNEL;
ttusb->dvb_demux.start_feed = ttusb_start_feed; ttusb->dvb_demux.start_feed = ttusb_start_feed;
ttusb->dvb_demux.stop_feed = ttusb_stop_feed; ttusb->dvb_demux.stop_feed = ttusb_stop_feed;
ttusb->dvb_demux.write_to_decoder = 0; ttusb->dvb_demux.write_to_decoder = NULL;
if ((result = dvb_dmx_init(&ttusb->dvb_demux)) < 0) { if ((result = dvb_dmx_init(&ttusb->dvb_demux)) < 0) {
printk("ttusb_dvb: dvb_dmx_init failed (errno = %d)\n", printk("ttusb_dvb: dvb_dmx_init failed (errno = %d)\n",
......
...@@ -314,7 +314,7 @@ static int ttusb_dec_audio_pes2ts_cb(void *priv, unsigned char *data) ...@@ -314,7 +314,7 @@ static int ttusb_dec_audio_pes2ts_cb(void *priv, unsigned char *data)
{ {
struct ttusb_dec *dec = (struct ttusb_dec *)priv; struct ttusb_dec *dec = (struct ttusb_dec *)priv;
dec->audio_filter->feed->cb.ts(data, 188, 0, 0, dec->audio_filter->feed->cb.ts(data, 188, NULL, 0,
&dec->audio_filter->feed->feed.ts, &dec->audio_filter->feed->feed.ts,
DMX_OK); DMX_OK);
...@@ -325,7 +325,7 @@ static int ttusb_dec_video_pes2ts_cb(void *priv, unsigned char *data) ...@@ -325,7 +325,7 @@ static int ttusb_dec_video_pes2ts_cb(void *priv, unsigned char *data)
{ {
struct ttusb_dec *dec = (struct ttusb_dec *)priv; struct ttusb_dec *dec = (struct ttusb_dec *)priv;
dec->video_filter->feed->cb.ts(data, 188, 0, 0, dec->video_filter->feed->cb.ts(data, 188, NULL, 0,
&dec->video_filter->feed->feed.ts, &dec->video_filter->feed->feed.ts,
DMX_OK); DMX_OK);
...@@ -378,7 +378,7 @@ static void ttusb_dec_process_pva(struct ttusb_dec *dec, u8 *pva, int length) ...@@ -378,7 +378,7 @@ static void ttusb_dec_process_pva(struct ttusb_dec *dec, u8 *pva, int length)
u16 v_pes_payload_length; u16 v_pes_payload_length;
if (output_pva) { if (output_pva) {
dec->video_filter->feed->cb.ts(pva, length, 0, 0, dec->video_filter->feed->cb.ts(pva, length, NULL, 0,
&dec->video_filter->feed->feed.ts, DMX_OK); &dec->video_filter->feed->feed.ts, DMX_OK);
return; return;
} }
...@@ -439,7 +439,7 @@ static void ttusb_dec_process_pva(struct ttusb_dec *dec, u8 *pva, int length) ...@@ -439,7 +439,7 @@ static void ttusb_dec_process_pva(struct ttusb_dec *dec, u8 *pva, int length)
case 0x02: /* MainAudioStream */ case 0x02: /* MainAudioStream */
if (output_pva) { if (output_pva) {
dec->audio_filter->feed->cb.ts(pva, length, 0, 0, dec->audio_filter->feed->cb.ts(pva, length, NULL, 0,
&dec->audio_filter->feed->feed.ts, DMX_OK); &dec->audio_filter->feed->feed.ts, DMX_OK);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment