From: Deepthy Ravi <deepthy.ravi@ti.com>
To: mchehab@infradead.org, linux-media@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: linux-omap@vger.kernel.org, Vaibhav Hiremath <hvaibhav@ti.com>,
Deepthy Ravi <deepthy.ravi@ti.com>
Subject: [PATCH] Media controller: Define media_entity_init() and media_entity_cleanup() conditionally
Date: Wed, 17 Aug 2011 16:04:36 +0530 [thread overview]
Message-ID: <1313577276-18182-1-git-send-email-deepthy.ravi@ti.com> (raw)
From: Vaibhav Hiremath <hvaibhav@ti.com>
Defines the two functions only when CONFIG_MEDIA_CONTROLLER
is enabled.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Deepthy Ravi <deepthy.ravi@ti.com>
---
include/media/media-entity.h | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index cd8bca6..c90916e 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -121,9 +121,18 @@ struct media_entity_graph {
int top;
};
+#ifdef CONFIG_MEDIA_CONTROLLER
int media_entity_init(struct media_entity *entity, u16 num_pads,
struct media_pad *pads, u16 extra_links);
void media_entity_cleanup(struct media_entity *entity);
+#else
+static inline int media_entity_init(struct media_entity *entity, u16 num_pads,
+ struct media_pad *pads, u16 extra_links)
+{
+ return 0;
+}
+static inline void media_entity_cleanup(struct media_entity *entity) {}
+#endif
int media_entity_create_link(struct media_entity *source, u16 source_pad,
struct media_entity *sink, u16 sink_pad, u32 flags);
--
1.7.0.4
next reply other threads:[~2011-08-17 10:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-17 10:34 Deepthy Ravi [this message]
2011-08-17 10:53 ` [PATCH] Media controller: Define media_entity_init() and media_entity_cleanup() conditionally Andy Shevchenko
2011-08-18 9:03 ` Laurent Pinchart
2011-08-17 15:30 ` Hiremath, Vaibhav
2011-08-18 10:09 ` Ravi, Deepthy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313577276-18182-1-git-send-email-deepthy.ravi@ti.com \
--to=deepthy.ravi@ti.com \
--cc=hvaibhav@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mchehab@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox