| Message ID | 20190626074421.38739-13-hverkuil-cisco@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media/platform: set device_caps in struct video_device | expand |
iHi Hans, On Wed, Jun 26, 2019 at 09:44:17AM +0200, Hans Verkuil wrote: > Instead of filling in the struct v4l2_capability device_caps > field, fill in the struct video_device device_caps field. > > That way the V4L2 core knows what the capabilities of the > video device are. > > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > Cc: Jacopo Mondi <jacopo@jmondi.org> Thanks for doing this. Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Thanks j > --- > drivers/media/platform/sh_veu.c | 4 +--- > drivers/media/platform/sh_vou.c | 5 ++--- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c > index 5a9ba05c996e..ab39d6c80920 100644 > --- a/drivers/media/platform/sh_veu.c > +++ b/drivers/media/platform/sh_veu.c > @@ -348,9 +348,6 @@ static int sh_veu_querycap(struct file *file, void *priv, > strscpy(cap->driver, "sh-veu", sizeof(cap->driver)); > strscpy(cap->card, "sh-mobile VEU", sizeof(cap->card)); > strscpy(cap->bus_info, "platform:sh-veu", sizeof(cap->bus_info)); > - cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; > - cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; > - > return 0; > } > > @@ -1039,6 +1036,7 @@ static const struct video_device sh_veu_videodev = { > .minor = -1, > .release = video_device_release_empty, > .vfl_dir = VFL_DIR_M2M, > + .device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING, > }; > > static const struct v4l2_m2m_ops sh_veu_m2m_ops = { > diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c > index 5799aa4b9323..1fe573a90f0d 100644 > --- a/drivers/media/platform/sh_vou.c > +++ b/drivers/media/platform/sh_vou.c > @@ -381,9 +381,6 @@ static int sh_vou_querycap(struct file *file, void *priv, > strscpy(cap->card, "SuperH VOU", sizeof(cap->card)); > strscpy(cap->driver, "sh-vou", sizeof(cap->driver)); > strscpy(cap->bus_info, "platform:sh-vou", sizeof(cap->bus_info)); > - cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_READWRITE | > - V4L2_CAP_STREAMING; > - cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; > return 0; > } > > @@ -1218,6 +1215,8 @@ static const struct video_device sh_vou_video_template = { > .ioctl_ops = &sh_vou_ioctl_ops, > .tvnorms = V4L2_STD_525_60, /* PAL only supported in 8-bit non-bt656 mode */ > .vfl_dir = VFL_DIR_TX, > + .device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_READWRITE | > + V4L2_CAP_STREAMING, > }; > > static int sh_vou_probe(struct platform_device *pdev) > -- > 2.20.1 >
diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c index 5a9ba05c996e..ab39d6c80920 100644 --- a/drivers/media/platform/sh_veu.c +++ b/drivers/media/platform/sh_veu.c @@ -348,9 +348,6 @@ static int sh_veu_querycap(struct file *file, void *priv, strscpy(cap->driver, "sh-veu", sizeof(cap->driver)); strscpy(cap->card, "sh-mobile VEU", sizeof(cap->card)); strscpy(cap->bus_info, "platform:sh-veu", sizeof(cap->bus_info)); - cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; - cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; - return 0; } @@ -1039,6 +1036,7 @@ static const struct video_device sh_veu_videodev = { .minor = -1, .release = video_device_release_empty, .vfl_dir = VFL_DIR_M2M, + .device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING, }; static const struct v4l2_m2m_ops sh_veu_m2m_ops = { diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index 5799aa4b9323..1fe573a90f0d 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c @@ -381,9 +381,6 @@ static int sh_vou_querycap(struct file *file, void *priv, strscpy(cap->card, "SuperH VOU", sizeof(cap->card)); strscpy(cap->driver, "sh-vou", sizeof(cap->driver)); strscpy(cap->bus_info, "platform:sh-vou", sizeof(cap->bus_info)); - cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_READWRITE | - V4L2_CAP_STREAMING; - cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; } @@ -1218,6 +1215,8 @@ static const struct video_device sh_vou_video_template = { .ioctl_ops = &sh_vou_ioctl_ops, .tvnorms = V4L2_STD_525_60, /* PAL only supported in 8-bit non-bt656 mode */ .vfl_dir = VFL_DIR_TX, + .device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_READWRITE | + V4L2_CAP_STREAMING, }; static int sh_vou_probe(struct platform_device *pdev)
Instead of filling in the struct v4l2_capability device_caps field, fill in the struct video_device device_caps field. That way the V4L2 core knows what the capabilities of the video device are. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Cc: Jacopo Mondi <jacopo@jmondi.org> --- drivers/media/platform/sh_veu.c | 4 +--- drivers/media/platform/sh_vou.c | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-)