Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1350119 > unrolled thread

[PATCH] v4l2-mc.h: fix PM/pipeline stub definitions

Back to article view | Back to linux.kernel

Contents

  [PATCH] v4l2-mc.h: fix PM/pipeline stub definitions Arnd Bergmann <arnd@arndb.de> - 2016-03-04 11:20 +0100
    Re: [PATCH] v4l2-mc.h: fix PM/pipeline stub definitions Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-03-04 12:00 +0100

#1350119 — [PATCH] v4l2-mc.h: fix PM/pipeline stub definitions

The newly added functions have an extra semicolon, which
prevents compilation, and they need to be marked inline:

In file included from ../include/media/tuner.h:23:0,
                 from ../drivers/media/tuners/tuner-simple.c:10:
../include/media/v4l2-mc.h:233:1: error: expected identifier or '(' before '{' token

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: a77bf7048add ("v4l2-mc.h: Add stubs for the V4L2 PM/pipeline routines")
---
 include/media/v4l2-mc.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 96cfca9cd338..6096e635fc9f 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -229,13 +229,13 @@ static inline int v4l_vb2q_enable_media_source(struct vb2_queue *q)
 	return 0;
 }
 
-int v4l2_pipeline_pm_use(struct media_entity *entity, int use);
+static inline int v4l2_pipeline_pm_use(struct media_entity *entity, int use)
 {
 	return 0;
 }
 
-int v4l2_pipeline_link_notify(struct media_link *link, u32 flags,
-			      unsigned int notification);
+static inline int v4l2_pipeline_link_notify(struct media_link *link, u32 flags,
+			      unsigned int notification)
 {
 	return 0;
 }
-- 
2.7.0

[toc] | [next] | [standalone]

#1350146

Em Fri, 04 Mar 2016 11:13:36 +0100
Arnd Bergmann <arnd@arndb.de> escreveu:

> The newly added functions have an extra semicolon, which
> prevents compilation, and they need to be marked inline:
> 
> In file included from ../include/media/tuner.h:23:0,
>                  from ../drivers/media/tuners/tuner-simple.c:10:
> ../include/media/v4l2-mc.h:233:1: error: expected identifier or '(' before '{' token
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: a77bf7048add ("v4l2-mc.h: Add stubs for the V4L2 PM/pipeline routines")

Hans sent a fix almost of the same time as yours.

I'm merging your SOB on his patch (with has an additional hunk removing
an uneeded return).

Thanks!
Mauro

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web