aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-09-28 13:03:26 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-10-03 14:14:20 -0400
commitab9caf9e221ee1b13186a9144da26ac358f2a6f4 (patch)
tree758c8b0bf5ad1a4d922772f7ddc64101993b52ee
parentdcc29cbcec8c8482eea249030e0aa65b7451073d (diff)
V4L/DVB (4674): Use NULL instead of 0 for ptrs
Use NULL instead of 0 for pointer value, eliminate sparse warnings. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/dvb-usb/gp8psk.c2
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/dvb/dvb-usb/gp8psk.c
index 334269bd065d..7375eb20166d 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk.c
@@ -219,7 +219,7 @@ static struct dvb_usb_device_properties gp8psk_properties = {
219 .cold_ids = { &gp8psk_usb_table[0], NULL }, 219 .cold_ids = { &gp8psk_usb_table[0], NULL },
220 .warm_ids = { &gp8psk_usb_table[1], NULL }, 220 .warm_ids = { &gp8psk_usb_table[1], NULL },
221 }, 221 },
222 { 0 }, 222 { NULL },
223 } 223 }
224}; 224};
225 225
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 663b7137972c..46738321adaf 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -896,7 +896,7 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
896 snprintf(name, sizeof(name), "%s/2", core->name); 896 snprintf(name, sizeof(name), "%s/2", core->name);
897 printk("%s/2: ============ START LOG STATUS ============\n", 897 printk("%s/2: ============ START LOG STATUS ============\n",
898 core->name); 898 core->name);
899 cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, 0); 899 cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, NULL);
900 cx2341x_log_status(&dev->params, name); 900 cx2341x_log_status(&dev->params, name);
901 printk("%s/2: ============= END LOG STATUS =============\n", 901 printk("%s/2: ============= END LOG STATUS =============\n",
902 core->name); 902 core->name);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index ed3e8105292a..05121666b9ba 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -19,6 +19,7 @@
19 * 19 *
20 */ 20 */
21 21
22#include <linux/kernel.h>
22#include "pvrusb2-i2c-core.h" 23#include "pvrusb2-i2c-core.h"
23#include "pvrusb2-hdw-internal.h" 24#include "pvrusb2-hdw-internal.h"
24#include "pvrusb2-debug.h" 25#include "pvrusb2-debug.h"
@@ -89,7 +90,8 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
89 90
90const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx) 91const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx)
91{ 92{
92 if (idx >= sizeof(ops)/sizeof(ops[0])) return 0; 93 if (idx >= ARRAY_SIZE(ops))
94 return NULL;
93 return ops[idx]; 95 return ops[idx];
94} 96}
95 97