Messages in this thread Patch in this message | | | From | "Ravi, Deepthy" <> | Date | Thu, 18 Aug 2011 15:39:07 +0530 | Subject | RE: [PATCH] Media controller: Define media_entity_init() and media_entity_cleanup() conditionally |
| |
Thanks, Deepthy Ravi. ________________________________________ From: Hiremath, Vaibhav Sent: Wednesday, August 17, 2011 9:00 PM To: Ravi, Deepthy; mchehab@infradead.org; linux-media@vger.kernel.org; linux-kernel@vger.kernel.org Cc: linux-omap@vger.kernel.org Subject: RE: [PATCH] Media controller: Define media_entity_init() and media_entity_cleanup() conditionally
> -----Original Message----- > From: Ravi, Deepthy > Sent: Wednesday, August 17, 2011 4:05 PM > To: mchehab@infradead.org; linux-media@vger.kernel.org; linux- > kernel@vger.kernel.org > Cc: linux-omap@vger.kernel.org; Hiremath, Vaibhav; Ravi, Deepthy > Subject: [PATCH] Media controller: Define media_entity_init() and > media_entity_cleanup() conditionally > > From: Vaibhav Hiremath <hvaibhav@ti.com> > > Defines the two functions only when CONFIG_MEDIA_CONTROLLER > is enabled. [Hiremath, Vaibhav] Deepthy,
You may want to mention about build failure without MEDIA_CONTROLLER option being enabled, especially if any sensor driver is being used between MC and non-MC framework compatible devices. For example, OMAP3 and AM3517, where TVP5146 is being used but OMAP3 is based on MC framework and AM3517 is based on simple sub-dev based interface.
[Deepthy Ravi] Ok. I will change description to include that.
Thanks, Vaibhav > > 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
| |