[media] media: omap/omap_vout: fix type of input members to omap_vout_setup_vrfb_bufs()
authorLad, Prabhakar <prabhakar.csengg@gmail.com>
Tue, 24 Feb 2015 18:25:00 +0000 (15:25 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 3 Mar 2015 14:22:58 +0000 (11:22 -0300)
the declaration for omap_vout_setup_vrfb_bufs() said it
needed 'u32 static_vrfb_allocation' but definition
took 'bool static_vrfb_allocation', this patch fixes the
declaration so that it matches with the definition and
pass a bool instead of int to the call, also included
omap_vout_vrfb.h in omap_vout_vrfb.c file so that sparse doesn't
complain of making omap_vout_setup_vrfb_bufs() as static function.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap/omap_vout_vrfb.c
drivers/media/platform/omap/omap_vout_vrfb.h

index ba2d8f973d580aca85e4195dd9d9eb68cf86568e..17b189a81ec597ccbc2d470247155c27bcd00848 100644 (file)
@@ -1978,7 +1978,7 @@ static int __init omap_vout_setup_video_bufs(struct platform_device *pdev,
        vout->cropped_offset = 0;
 
        if (ovid->rotation_type == VOUT_ROT_VRFB) {
-               int static_vrfb_allocation = (vid_num == 0) ?
+               bool static_vrfb_allocation = (vid_num == 0) ?
                        vid1_static_vrfb_alloc : vid2_static_vrfb_alloc;
                ret = omap_vout_setup_vrfb_bufs(pdev, vid_num,
                                static_vrfb_allocation);
index aa39306afc73ac84439655314460acfa3202b43d..c6e252760c621d52a6f96ded885cb1a292735539 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "omap_voutdef.h"
 #include "omap_voutlib.h"
+#include "omap_vout_vrfb.h"
 
 #define OMAP_DMA_NO_DEVICE     0
 
index 4c2314839b487768a9257d61ac3e9a30a46da2c6..c976975024df29a19b66794ec5cf28b6a89c4dc3 100644 (file)
@@ -15,7 +15,7 @@
 #ifdef CONFIG_VIDEO_OMAP2_VOUT_VRFB
 void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout);
 int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num,
-                       u32 static_vrfb_allocation);
+                       bool static_vrfb_allocation);
 void omap_vout_release_vrfb(struct omap_vout_device *vout);
 int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,
                        unsigned int *count, unsigned int startindex);
@@ -25,7 +25,7 @@ void omap_vout_calculate_vrfb_offset(struct omap_vout_device *vout);
 #else
 static inline void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout) { };
 static inline int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num,
-                       u32 static_vrfb_allocation)
+                       bool static_vrfb_allocation)
                { return 0; };
 static inline void omap_vout_release_vrfb(struct omap_vout_device *vout) { };
 static inline int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,