UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media: omap/omap_vout: fix type of input members to omap_vout_setup_vrfb_bufs() 

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>
This commit is contained in:
Lad, Prabhakar 2015-02-24 15:25:00 -03:00 committed by Mauro Carvalho Chehab
parent bb057a791e
commit ac0b2b3072
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/omap/omap_vout.c
View File

@ -1978,7 +1978,7 @@ static int __init omap_vout_setup_video_bufs(struct platform_device *pdev,
vout->cropped_offset = 0; vout->cropped_offset = 0;
if (ovid->rotation_type == VOUT_ROT_VRFB) { 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; vid1_static_vrfb_alloc : vid2_static_vrfb_alloc;
ret = omap_vout_setup_vrfb_bufs(pdev, vid_num, ret = omap_vout_setup_vrfb_bufs(pdev, vid_num,
static_vrfb_allocation); static_vrfb_allocation);

1
drivers/media/platform/omap/omap_vout_vrfb.c
View File

@ -21,6 +21,7 @@
#include "omap_voutdef.h" #include "omap_voutdef.h"
#include "omap_voutlib.h" #include "omap_voutlib.h"
#include "omap_vout_vrfb.h"
#define OMAP_DMA_NO_DEVICE 0 #define OMAP_DMA_NO_DEVICE 0

4
drivers/media/platform/omap/omap_vout_vrfb.h
View File

@ -15,7 +15,7 @@
#ifdef CONFIG_VIDEO_OMAP2_VOUT_VRFB #ifdef CONFIG_VIDEO_OMAP2_VOUT_VRFB
void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout); void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout);
int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num, 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); void omap_vout_release_vrfb(struct omap_vout_device *vout);
int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout, int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,
unsigned int *count, unsigned int startindex); unsigned int *count, unsigned int startindex);
@ -25,7 +25,7 @@ void omap_vout_calculate_vrfb_offset(struct omap_vout_device *vout);
#else #else
static inline void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout) { }; 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, 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; }; { return 0; };
static inline void omap_vout_release_vrfb(struct omap_vout_device *vout) { }; 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, static inline int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,