> -----Original Message-----
> From: Ravi, Deepthy
> Sent: Wednesday, August 17, 2011 4:05 PM
> To: mche...@infradead.org; linux-media@vger.kernel.org; linux-
> ker...@vger.kernel.org
> Cc: linux-o...@vger.kernel.org; Hiremath, Vaibhav; Ravi, Deepthy
> Subject: [PATCH] Media controller: Define media_entity_init() and
> media_entity_cleanup() conditionally
>
> From: Vaibhav Hiremath <hvaib...@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.
Thanks,
Vaibhav
>
> Signed-off-by: Vaibhav Hiremath <hvaib...@ti.com>
> Signed-off-by: Deepthy Ravi <deepthy.r...@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
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
