Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac0b2b30 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent bb057a79

drivers/media/platform/omap/omap_vout.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/omap/omap_vout_vrfb.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include "omap_voutdef.h"

#include "omap_voutlib.h"

#include "omap_vout_vrfb.h"



#define OMAP_DMA_NO_DEVICE	0

drivers/media/platform/omap/omap_vout_vrfb.h

+2 −2
Original line number Diff line number Diff line
@@ -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,