Commit 2367eb3f authored by Michael Zoran's avatar Michael Zoran Committed by Greg Kroah-Hartman

staging: bcm2835-camera: Fix bogus compiler warnings regarding constants

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: default avatarMichael Zoran <mzoran@crowfest.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85b1ac73
...@@ -125,7 +125,7 @@ int set_framerate_params(struct bm2835_mmal_dev *dev); ...@@ -125,7 +125,7 @@ int set_framerate_params(struct bm2835_mmal_dev *dev);
{ \ { \
v4l2_dbg(level, debug, 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", \ "%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)->width, (pix_fmt)->height, (pix_fmt)->field, \
(pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \ (pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \
(pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \ (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \
...@@ -135,7 +135,7 @@ int set_framerate_params(struct bm2835_mmal_dev *dev); ...@@ -135,7 +135,7 @@ int set_framerate_params(struct bm2835_mmal_dev *dev);
v4l2_dbg(level, debug, dev, \ v4l2_dbg(level, debug, dev, \
"%s: w %u h %u l %u t %u field %u chromakey %06X clip %p " \ "%s: w %u h %u l %u t %u field %u chromakey %06X clip %p " \
"clipcount %u bitmap %p\n", \ "clipcount %u bitmap %p\n", \
!desc ? "" : desc, \ desc, \
(win_fmt)->w.width, (win_fmt)->w.height, \ (win_fmt)->w.width, (win_fmt)->w.height, \
(win_fmt)->w.left, (win_fmt)->w.top, \ (win_fmt)->w.left, (win_fmt)->w.top, \
(win_fmt)->field, \ (win_fmt)->field, \
......
...@@ -837,7 +837,8 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance, ...@@ -837,7 +837,8 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance,
if (payload_len > if (payload_len >
(MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) { (MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) {
pr_err("payload length %d exceeds max:%d\n", payload_len, 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; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment