staging: bcm2835-camera: Fix bogus compiler warnings regarding constants
authorMichael Zoran <mzoran@crowfest.net>
Fri, 10 Mar 2017 05:08:58 +0000 (21:08 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2017 09:12:10 +0000 (10:12 +0100)
In debug logging code, the compiler is warning about imposible
situations and size of constants not matching the format specifier.

This change fixes all three instances of this.

Signed-off-by: Michael Zoran <mzoran@crowfest.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

index ff8d020739ba57778a9680a5a2f001c77cbaa18a..404037476bc5119acb2f37dbd92900a3f8719bf9 100644 (file)
@@ -125,7 +125,7 @@ int set_framerate_params(struct bm2835_mmal_dev *dev);
 {      \
        v4l2_dbg(level, debug, dev,     \
 "%s: w %u h %u field %u pfmt 0x%x bpl %u sz_img %u colorspace 0x%x priv %u\n", \
-               !desc ? "" : desc,      \
+               desc,   \
                (pix_fmt)->width, (pix_fmt)->height, (pix_fmt)->field,  \
                (pix_fmt)->pixelformat, (pix_fmt)->bytesperline,        \
                (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \
@@ -135,7 +135,7 @@ int set_framerate_params(struct bm2835_mmal_dev *dev);
        v4l2_dbg(level, debug, dev,     \
 "%s: w %u h %u l %u t %u  field %u chromakey %06X clip %p " \
 "clipcount %u bitmap %p\n", \
-               !desc ? "" : desc,      \
+               desc,   \
                (win_fmt)->w.width, (win_fmt)->w.height, \
                (win_fmt)->w.left, (win_fmt)->w.top, \
                (win_fmt)->field,       \
index 976aa08365f216b61ef068f8b95ee593162f497d..5a431bcc711abe5581ebb38eba60ad41aefbf0a7 100644 (file)
@@ -837,7 +837,8 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance,
        if (payload_len >
            (MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) {
                pr_err("payload length %d exceeds max:%d\n", payload_len,
-                      (MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header)));
+                     (int)(MMAL_MSG_MAX_SIZE -
+                           sizeof(struct mmal_msg_header)));
                return -EINVAL;
        }