| Message ID | 20211207000629.4985-3-ribalda@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | uvc: Restore old vdev name | expand |
Hi Ricardo, Thank you for the patch. On Tue, Dec 07, 2021 at 01:06:28AM +0100, Ricardo Ribalda wrote: > If the driver provides an name for an entity, use it. > This is particularly useful for drivers that export multiple video > devices for the same hardware (i.e. metadata and data). This seems reasonable (especially given that I've proposed it), but I may be missing unintented consequences. Other reviews would be useful. > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> > --- > drivers/media/v4l2-core/v4l2-dev.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c > index d03ace324db0..4c00503b9349 100644 > --- a/drivers/media/v4l2-core/v4l2-dev.c > +++ b/drivers/media/v4l2-core/v4l2-dev.c > @@ -832,7 +832,9 @@ static int video_register_media_controller(struct video_device *vdev) > } > > if (vdev->entity.function != MEDIA_ENT_F_UNKNOWN) { > - vdev->entity.name = vdev->name; > + /* Use entity names provided by the driver, if available. */ > + if (!vdev->entity.name) > + vdev->entity.name = vdev->name; We need to document this. > > /* Needed just for backward compatibility with legacy MC API */ > vdev->entity.info.dev.major = VIDEO_MAJOR;
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c index d03ace324db0..4c00503b9349 100644 --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c @@ -832,7 +832,9 @@ static int video_register_media_controller(struct video_device *vdev) } if (vdev->entity.function != MEDIA_ENT_F_UNKNOWN) { - vdev->entity.name = vdev->name; + /* Use entity names provided by the driver, if available. */ + if (!vdev->entity.name) + vdev->entity.name = vdev->name; /* Needed just for backward compatibility with legacy MC API */ vdev->entity.info.dev.major = VIDEO_MAJOR;
If the driver provides an name for an entity, use it. This is particularly useful for drivers that export multiple video devices for the same hardware (i.e. metadata and data). Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/v4l2-core/v4l2-dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)