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

Commit acd14c18 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-device.h: always expose mdev 



The mdev field is only present if CONFIG_MEDIA_CONTROLLER is set.
But since we will need to pass the media_device to vb2 and the
control framework it is very convenient to just make this field
available all the time. If CONFIG_MEDIA_CONTROLLER is not set,
then it will just be NULL.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 3ad3b7a2

include/media/v4l2-device.h

+1 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct v4l2_ctrl_handler; 
 * struct v4l2_device - main struct to for V4L2 device drivers

 *

 * @dev: pointer to struct device.

 * @mdev: pointer to struct media_device

 * @mdev: pointer to struct media_device, may be NULL.

 * @subdevs: used to keep track of the registered subdevs

 * @lock: lock this struct; can be used by the driver as well

 *	if this struct is embedded into a larger struct.
@@ -58,9 +58,7 @@ struct v4l2_ctrl_handler; 
 */

struct v4l2_device {

	struct device *dev;

#if defined(CONFIG_MEDIA_CONTROLLER)

	struct media_device *mdev;

#endif

	struct list_head subdevs;

	spinlock_t lock;

	char name[V4L2_DEVICE_NAME_SIZE];