merge back various cleanups from mainline kernel:

- sparse annotiations (viro)
- NULL noise removal (viro)
- #if where #ifdef should've been (saa7146) (viro)
- convert private ABS() to kernel's abs() (rddunlap)
- dvb_register_i2c_device() locking fix for -ENOMEM (akpm)
- dvb_register_i2c_bus() locking fix for -ENOMEM (akpm)

1 files changed, 6 insertions, 6 deletions

diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c
index af5c296e1..e81e0d663 100644
--- a/linux/drivers/media/dvb/b2c2/skystar2.c
+++ b/linux/drivers/media/dvb/b2c2/skystar2.c
@@ -217,7 +217,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);
 
-	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)
@@ -1689,7 +1689,7 @@ static void init_dma_queue(struct adapter *adapter)
 
 	adapter->dmaq1.head = 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);
 
@@ -1715,7 +1715,7 @@ static void init_dma_queue(struct adapter *adapter)
 
 	adapter->dmaq2.head = 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);
 
@@ -1746,7 +1746,7 @@ static void free_dma_queue(struct adapter *adapter)
 		adapter->dmaq1.head = 0;
 		adapter->dmaq1.tail = 0;
 		adapter->dmaq1.buffer_size = 0;
-		adapter->dmaq1.buffer = 0;
+		adapter->dmaq1.buffer = NULL;
 	}
 
 	if (adapter->dmaq2.buffer != 0) {
@@ -1756,7 +1756,7 @@ static void free_dma_queue(struct adapter *adapter)
 		adapter->dmaq2.head = 0;
 		adapter->dmaq2.tail = 0;
 		adapter->dmaq2.buffer_size = 0;
-		adapter->dmaq2.buffer = 0;
+		adapter->dmaq2.buffer = NULL;
 	}
 }
 
@@ -2360,7 +2360,7 @@ static int skystar2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	dvbdemux->feednum = N_PID_SLOTS;
 	dvbdemux->start_feed = dvb_start_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);
 
 	dvb_dmx_init(&adapter->demux);