Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e576d60b authored by Shuah Khan's avatar Shuah Khan Committed by Mauro Carvalho Chehab
Browse files

[media] media: define Media Controller API when CONFIG_MEDIA_CONTROLLER enabled 



Change to define Media Controller API when CONFIG_MEDIA_CONTROLLER
is enabled. Define stubs for CONFIG_MEDIA_CONTROLLER disabled case.
This will help avoid drivers needing to enclose Media Controller
code within ifdef CONFIG_MEDIA_CONTROLLER block.

Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d062f911

drivers/media/media-device.c

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <media/media-devnode.h>

#include <media/media-entity.h>



#ifdef CONFIG_MEDIA_CONTROLLER



/* -----------------------------------------------------------------------------

 * Userspace API

 */
@@ -495,3 +497,5 @@ struct media_device *media_device_find_devres(struct device *dev) 
	return devres_find(dev, media_device_release_devres, NULL, NULL);

}

EXPORT_SYMBOL_GPL(media_device_find_devres);



#endif /* CONFIG_MEDIA_CONTROLLER */

include/media/media-device.h

+27 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ struct media_device { 
			   unsigned int notification);

};



#ifdef CONFIG_MEDIA_CONTROLLER



/* Supported link_notify @notification values. */

#define MEDIA_DEV_NOTIFY_PRE_LINK_CH	0

#define MEDIA_DEV_NOTIFY_POST_LINK_CH	1
@@ -102,4 +104,29 @@ struct media_device *media_device_find_devres(struct device *dev); 
#define media_device_for_each_entity(entity, mdev)			\

	list_for_each_entry(entity, &(mdev)->entities, list)



#else

static inline int media_device_register(struct media_device *mdev)

{

	return 0;

}

static inline void media_device_unregister(struct media_device *mdev)

{

}

static inline int media_device_register_entity(struct media_device *mdev,

						struct media_entity *entity)

{

	return 0;

}

static inline void media_device_unregister_entity(struct media_entity *entity)

{

}

static inline struct media_device *media_device_get_devres(struct device *dev)

{

	return NULL;

}

static inline struct media_device *media_device_find_devres(struct device *dev)

{

	return NULL;

}

#endif /* CONFIG_MEDIA_CONTROLLER */

#endif