Re: [PATCH] media: davinci: vpif: set device capabilities

From: Laurent Pinchart
Date: Tue Sep 25 2012 - 07:48:31 EST


Hi Hans,

On Tuesday 25 September 2012 13:43:36 Hans Verkuil wrote:
> On Tue 25 September 2012 13:16:24 Prabhakar wrote:
> > From: Lad, Prabhakar <prabhakar.lad@xxxxxx>
> >
> > Signed-off-by: Lad, Prabhakar <prabhakar.lad@xxxxxx>
> > Signed-off-by: Manjunath Hadli <manjunath.hadli@xxxxxx>
> > Cc: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> > ---
> >
> > drivers/media/platform/davinci/vpif_capture.c | 4 +++-
> > drivers/media/platform/davinci/vpif_display.c | 4 +++-
> > 2 files changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/platform/davinci/vpif_capture.c
> > b/drivers/media/platform/davinci/vpif_capture.c index 4828888..faeca98
> > 100644
> > --- a/drivers/media/platform/davinci/vpif_capture.c
> > +++ b/drivers/media/platform/davinci/vpif_capture.c
> > @@ -1630,7 +1630,9 @@ static int vpif_querycap(struct file *file, void
> > *priv,>
> > {
> >
> > struct vpif_capture_config *config = vpif_dev->platform_data;
> >
> > - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
> > + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
> > + V4L2_CAP_READWRITE;
> > + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
> >
> > strlcpy(cap->driver, "vpif capture", sizeof(cap->driver));
>
> This should be the real driver name which is 'vpif_capture'.
>
> > strlcpy(cap->bus_info, "VPIF Platform", sizeof(cap->bus_info));
>
> For bus_info I would use: "platform:vpif_capture".
>
> The 'platform:' prefix is going to be the standard for platform drivers.

What about

snprintf(cap->driver, sizeof(cap->driver), "platform:%s", dev_name(vpif_dev));

That would handle cases where multiple platform devices of the same type are
present.

> > strlcpy(cap->card, config->card_name, sizeof(cap->card));
> >
> > diff --git a/drivers/media/platform/davinci/vpif_display.c
> > b/drivers/media/platform/davinci/vpif_display.c index d94b8a2..171e449
> > 100644
> > --- a/drivers/media/platform/davinci/vpif_display.c
> > +++ b/drivers/media/platform/davinci/vpif_display.c
> > @@ -827,7 +827,9 @@ static int vpif_querycap(struct file *file, void
> > *priv,>
> > {
> >
> > struct vpif_display_config *config = vpif_dev->platform_data;
> >
> > - cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
> > + cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING |
> > + V4L2_CAP_READWRITE;
> > + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
> >
> > strlcpy(cap->driver, "vpif display", sizeof(cap->driver));
>
> vpif_driver
>
> > strlcpy(cap->bus_info, "Platform", sizeof(cap->bus_info));
>
> Ditto: "platform:vpif_driver".
>
> > strlcpy(cap->card, config->card_name, sizeof(cap->card));

--
Regards,

Laurent Pinchart

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/