On Mon, Apr 9, 2018 at 11:21 PM Hans Verkuil <hverk...@xs4all.nl> wrote:

> From: Hans Verkuil <hans.verk...@cisco.com>

> The mdev field is only present if CONFIG_MEDIA_CONTROLLER is set.
> But since we will need to pass the media_device to vb2 snd the

Typo: s/snd/and

> 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: Hans Verkuil <hans.verk...@cisco.com>
> ---
>   include/media/v4l2-device.h | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)

> diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
> index 0c9e4da55499..b330e4a08a6b 100644
> --- a/include/media/v4l2-device.h
> +++ b/include/media/v4l2-device.h
> @@ -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];
> --
> 2.16.3

Reply via email to