On Wed, Aug 24, 2011 at 4:47 PM, Laurent Pinchart
[laurent.pinch...@ideasonboard.com] wrote:
> On Friday 19 August 2011 15:48:45 Deepthy Ravi wrote:
>> From: Vaibhav Hiremath <hvaib...@ti.com>
>>
>> Fix the build break caused when CONFIG_MEDIA_CONTROLLER
>> option is disabled and if any sensor driver has to be used
>> between MC and non MC framework compatible devices.
>>
>> For example,if tvp514x video decoder driver migrated to
>> MC framework is being built without CONFIG_MEDIA_CONTROLLER
>> option enabled, the following error messages will result.
>> drivers/built-in.o: In function `tvp514x_remove':
>> drivers/media/video/tvp514x.c:1285: undefined reference to
>> `media_entity_cleanup'
>> drivers/built-in.o: In function `tvp514x_probe':
>> drivers/media/video/tvp514x.c:1237: undefined reference to
>> `media_entity_init'
>
> If the tvp514x is migrated to the MC framework, its Kconfig option should
> depend on MEDIA_CONTROLLER.
>The same TVP514x driver is being used for both MC and non MC compatible
>devices, for example OMAP3 and AM35x. So if it is made dependent on MEDIA
>CONTROLLER, we cannot enable the driver for MC independent devices.
>> The file containing definitions of media_entity_init and
>> media_entity_cleanup functions will not be built if that
>> config option is disabled. And this is corrected by
>> defining two dummy functions.
>>
>> 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);
>
> --
> Regards,
>
> Laurent Pinchart
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-inf
>--
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
