aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ngene
diff options
context:
space:
mode:
authorMárton Németh <nm127@freemail.hu>2010-02-28 09:34:35 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:46:24 -0400
commit7b1fc72c2fdeb91565f4969397757ee938cce67e (patch)
treee2c763d2c5c97f0d60e8228ea42153a3af7590ad /drivers/media/dvb/ngene
parent6c9eaa82da53676db830572f5a41aa9ffea133a1 (diff)
V4L/DVB: nGene: use NULL when pointer is needed
Use NULL when calling a function with pointer parameter, initializing a pointer and returning a pointer. This will remove the following sparse warning at different locations (see "make C=1"): * warning: Using plain integer as NULL pointer Signed-off-by: Márton Németh <nm127@freemail.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ngene')
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 645e8b8a7137..52f60d448de0 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -819,7 +819,7 @@ static int ngene_i2c_master_xfer(struct i2c_adapter *adapter,
819 msg[0].buf, msg[0].len)) 819 msg[0].buf, msg[0].len))
820 goto done; 820 goto done;
821 if (num == 1 && (msg[0].flags & I2C_M_RD)) 821 if (num == 1 && (msg[0].flags & I2C_M_RD))
822 if (!ngene_command_i2c_read(dev, msg[0].addr, 0, 0, 822 if (!ngene_command_i2c_read(dev, msg[0].addr, NULL, 0,
823 msg[0].buf, msg[0].len, 0)) 823 msg[0].buf, msg[0].len, 0))
824 goto done; 824 goto done;
825 825
@@ -882,7 +882,7 @@ static void *tsin_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags)
882 if (chan->users > 0) 882 if (chan->users > 0)
883#endif 883#endif
884 dvb_dmx_swfilter(&chan->demux, buf, len); 884 dvb_dmx_swfilter(&chan->demux, buf, len);
885 return 0; 885 return NULL;
886} 886}
887 887
888u8 fill_ts[188] = { 0x47, 0x1f, 0xff, 0x10 }; 888u8 fill_ts[188] = { 0x47, 0x1f, 0xff, 0x10 };
@@ -970,7 +970,7 @@ static void set_transfer(struct ngene_channel *chan, int state)
970 state); 970 state);
971 if (!state) { 971 if (!state) {
972 spin_lock_irq(&chan->state_lock); 972 spin_lock_irq(&chan->state_lock);
973 chan->pBufferExchange = 0; 973 chan->pBufferExchange = NULL;
974 dvb_ringbuffer_flush(&dev->tsout_rbuf); 974 dvb_ringbuffer_flush(&dev->tsout_rbuf);
975 spin_unlock_irq(&chan->state_lock); 975 spin_unlock_irq(&chan->state_lock);
976 } 976 }
@@ -1020,7 +1020,7 @@ static int my_dvb_dmx_ts_card_init(struct dvb_demux *dvbdemux, char *id,
1020 dvbdemux->feednum = 256; 1020 dvbdemux->feednum = 256;
1021 dvbdemux->start_feed = start_feed; 1021 dvbdemux->start_feed = start_feed;
1022 dvbdemux->stop_feed = stop_feed; 1022 dvbdemux->stop_feed = stop_feed;
1023 dvbdemux->write_to_decoder = 0; 1023 dvbdemux->write_to_decoder = NULL;
1024 dvbdemux->dmx.capabilities = (DMX_TS_FILTERING | 1024 dvbdemux->dmx.capabilities = (DMX_TS_FILTERING |
1025 DMX_SECTION_FILTERING | 1025 DMX_SECTION_FILTERING |
1026 DMX_MEMORY_BASED_FILTERING); 1026 DMX_MEMORY_BASED_FILTERING);
@@ -1094,8 +1094,8 @@ static void free_idlebuffer(struct ngene *dev,
1094 return; 1094 return;
1095 free_ringbuffer(dev, rb); 1095 free_ringbuffer(dev, rb);
1096 for (j = 0; j < tb->NumBuffers; j++, Cur = Cur->Next) { 1096 for (j = 0; j < tb->NumBuffers; j++, Cur = Cur->Next) {
1097 Cur->Buffer2 = 0; 1097 Cur->Buffer2 = NULL;
1098 Cur->scList2 = 0; 1098 Cur->scList2 = NULL;
1099 Cur->ngeneBuffer.Address_of_first_entry_2 = 0; 1099 Cur->ngeneBuffer.Address_of_first_entry_2 = 0;
1100 Cur->ngeneBuffer.Number_of_entries_2 = 0; 1100 Cur->ngeneBuffer.Number_of_entries_2 = 0;
1101 } 1101 }
@@ -1141,7 +1141,7 @@ static int create_ring_buffer(struct pci_dev *pci_dev,
1141 u64 PARingBufferNext; 1141 u64 PARingBufferNext;
1142 struct SBufferHeader *Cur, *Next; 1142 struct SBufferHeader *Cur, *Next;
1143 1143
1144 descr->Head = 0; 1144 descr->Head = NULL;
1145 descr->MemSize = 0; 1145 descr->MemSize = 0;
1146 descr->PAHead = 0; 1146 descr->PAHead = 0;
1147 descr->NumBuffers = 0; 1147 descr->NumBuffers = 0;
@@ -1719,7 +1719,7 @@ static void release_channel(struct ngene_channel *chan)
1719 if (chan->fe) { 1719 if (chan->fe) {
1720 dvb_unregister_frontend(chan->fe); 1720 dvb_unregister_frontend(chan->fe);
1721 dvb_frontend_detach(chan->fe); 1721 dvb_frontend_detach(chan->fe);
1722 chan->fe = 0; 1722 chan->fe = NULL;
1723 } 1723 }
1724 dvbdemux->dmx.close(&dvbdemux->dmx); 1724 dvbdemux->dmx.close(&dvbdemux->dmx);
1725 dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, 1725 dvbdemux->dmx.remove_frontend(&dvbdemux->dmx,
@@ -1820,7 +1820,7 @@ static void __devexit ngene_remove(struct pci_dev *pdev)
1820 release_channel(&dev->channel[i]); 1820 release_channel(&dev->channel[i]);
1821 ngene_stop(dev); 1821 ngene_stop(dev);
1822 ngene_release_buffers(dev); 1822 ngene_release_buffers(dev);
1823 pci_set_drvdata(pdev, 0); 1823 pci_set_drvdata(pdev, NULL);
1824 pci_disable_device(pdev); 1824 pci_disable_device(pdev);
1825} 1825}
1826 1826
@@ -1868,7 +1868,7 @@ fail1:
1868 ngene_release_buffers(dev); 1868 ngene_release_buffers(dev);
1869fail0: 1869fail0:
1870 pci_disable_device(pci_dev); 1870 pci_disable_device(pci_dev);
1871 pci_set_drvdata(pci_dev, 0); 1871 pci_set_drvdata(pci_dev, NULL);
1872 return stat; 1872 return stat;
1873} 1873}
1874 1874