[PATCH] staging: bcm2835-camera: call function instead of macro

[Kaaira Gupta]

Fix checkpatch.pl warning of 'macro argument reuse' in bcm2835-camera.h
by removing the macro and calling the function, written in macro in
bcm2835-camera.h, directly in bcm2835-camera.c

Signed-off-by: Kaaira Gupta <kgu...@es.iitr.ac.in>
---
 .../bcm2835-camera/bcm2835-camera.c           | 28 +++++++++++++++----
 .../bcm2835-camera/bcm2835-camera.h           | 10 -------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c 
b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 1ef31a984741..19b3ba80d0e7 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -919,9 +919,17 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void 
*priv,
        else
                f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
        f->fmt.pix.priv = 0;
-
-       v4l2_dump_pix_format(1, bcm2835_v4l2_debug, &dev->v4l2_dev, &f->fmt.pix,
-                            __func__);
+       v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+                "%s: w %u h %u field %u pfmt 0x%x bpl %u sz_img %u colorspace 
0x%x priv %u\n",
+                 __func__,
+                (&f->fmt.pix)->width,
+                (&f->fmt.pix)->height,
+                (&f->fmt.pix)->field,
+                (&f->fmt.pix)->pixelformat,
+                (&f->fmt.pix)->bytesperline,
+                (&f->fmt.pix)->sizeimage,
+                (&f->fmt.pix)->colorspace,
+                (&f->fmt.pix)->priv);
        return 0;
 }
 
@@ -995,9 +1003,17 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void 
*priv,
        v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
                 "Now %dx%d format %08X\n",
                f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.pixelformat);
-
-       v4l2_dump_pix_format(1, bcm2835_v4l2_debug, &dev->v4l2_dev, &f->fmt.pix,
-                            __func__);
+       v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+                "%s: w %u h %u field %u pfmt 0x%x bpl %u sz_img %u colorspace 
0x%x priv %u\n",
+                __func__,
+                (&f->fmt.pix)->width,
+                (&f->fmt.pix)->height,
+                (&f->fmt.pix)->field,
+                (&f->fmt.pix)->pixelformat,
+                (&f->fmt.pix)->bytesperline,
+                (&f->fmt.pix)->sizeimage,
+                (&f->fmt.pix)->colorspace,
+                (&f->fmt.pix)->priv);
        return 0;
 }
 
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h 
b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
index b5fce38de038..2e3e1954e3ce 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
@@ -121,16 +121,6 @@ int set_framerate_params(struct bm2835_mmal_dev *dev);
 
 /* Debug helpers */
 
-#define v4l2_dump_pix_format(level, debug, dev, pix_fmt, desc) \
-{      \
-       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,   \
-               (pix_fmt)->width, (pix_fmt)->height, (pix_fmt)->field,  \
-               (pix_fmt)->pixelformat, (pix_fmt)->bytesperline,        \
-               (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \
-}
-
 #define v4l2_dump_win_format(level, debug, dev, win_fmt, desc) \
 {      \
        v4l2_dbg(level, debug, dev,     \
-- 
2.17.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel