[media] videobuf: fix sparse warnings
authorHans Verkuil <hans.verkuil@cisco.com>
Wed, 5 Nov 2014 07:51:26 +0000 (04:51 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 5 Nov 2014 11:07:58 +0000 (09:07 -0200)
videobuf-core.c:834:23: warning: Using plain integer as NULL pointer
videobuf-core.c:851:28: warning: Using plain integer as NULL pointer

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/v4l2-core/videobuf-core.c

index b91a266d0b7efcced9ad3bbca2b08cb398377505..926836d1813a0051e41f0b35ebb7f85598ca86cf 100644 (file)
@@ -51,6 +51,8 @@ MODULE_LICENSE("GPL");
 
 #define CALL(q, f, arg...)                                             \
        ((q->int_ops->f) ? q->int_ops->f(arg) : 0)
+#define CALLPTR(q, f, arg...)                                          \
+       ((q->int_ops->f) ? q->int_ops->f(arg) : NULL)
 
 struct videobuf_buffer *videobuf_alloc_vb(struct videobuf_queue *q)
 {
@@ -831,7 +833,7 @@ static int __videobuf_copy_to_user(struct videobuf_queue *q,
                                   char __user *data, size_t count,
                                   int nonblocking)
 {
-       void *vaddr = CALL(q, vaddr, buf);
+       void *vaddr = CALLPTR(q, vaddr, buf);
 
        /* copy to userspace */
        if (count > buf->size - q->read_off)
@@ -848,7 +850,7 @@ static int __videobuf_copy_stream(struct videobuf_queue *q,
                                  char __user *data, size_t count, size_t pos,
                                  int vbihack, int nonblocking)
 {
-       unsigned int *fc = CALL(q, vaddr, buf);
+       unsigned int *fc = CALLPTR(q, vaddr, buf);
 
        if (vbihack) {
                /* dirty, undocumented hack -- pass the frame counter