]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] omap: fix compilation if !VIDEO_OMAP2_VOUT_VRFB
authorMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 22 Aug 2014 16:11:06 +0000 (11:11 -0500)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 26 Aug 2014 21:52:05 +0000 (18:52 -0300)
When CONFIG_VIDEO_OMAP2_VOUT_VRFB is disabled, the compilation
will fail, as the function stubs are wrong. Also, as they weren't
declared as static inline, lots of warnings will be generated.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/omap/omap_vout_vrfb.h

index ffde741e0590813c754dda94dc4ee0c9277484bc..4c2314839b487768a9257d61ac3e9a30a46da2c6 100644 (file)
@@ -23,18 +23,18 @@ int omap_vout_prepare_vrfb(struct omap_vout_device *vout,
                        struct videobuf_buffer *vb);
 void omap_vout_calculate_vrfb_offset(struct omap_vout_device *vout);
 #else
-void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout) { }
-int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num,
+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)
-               { return 0; }
-void omap_vout_release_vrfb(struct omap_vout_device *vout) { }
-int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,
+               { 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,
                        unsigned int *count, unsigned int startindex)
-               { return 0; }
-int omap_vout_prepare_vrfb(struct omap_vout_device *vout,
+               { return 0; };
+static inline int omap_vout_prepare_vrfb(struct omap_vout_device *vout,
                        struct videobuf_buffer *vb)
-               { return 0; }
-void omap_vout_calculate_vrfb_offset(struct omap_vout_device *vout) { }
+               { return 0; };
+static inline void omap_vout_calculate_vrfb_offset(struct omap_vout_device *vout) { };
 #endif
 
 #endif