renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code

media: vimc: fill in bus_info in media_device_info

Browse Source 
It is good practice to fill in bus_info.

Also just use 'platform:vimc' when filling in the bus_info in querycap:
the bus_info has nothing to do with the video device name.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Hans Verkuil 2019-01-30 08:43:51 -05:00 committed by Mauro Carvalho Chehab
parent db89a47fb9
commit 6fd369dd1c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/vimc/vimc-capture.c
View File

@ -70,12 +70,10 @@ struct vimc_cap_buffer {
static int vimc_cap_querycap(struct file *file, void *priv, static int vimc_cap_querycap(struct file *file, void *priv,
struct v4l2_capability *cap) struct v4l2_capability *cap)
{ {
struct vimc_cap_device *vcap = video_drvdata(file);
strscpy(cap->driver, VIMC_PDEV_NAME, sizeof(cap->driver)); strscpy(cap->driver, VIMC_PDEV_NAME, sizeof(cap->driver));
strscpy(cap->card, KBUILD_MODNAME, sizeof(cap->card)); strscpy(cap->card, KBUILD_MODNAME, sizeof(cap->card));
snprintf(cap->bus_info, sizeof(cap->bus_info), snprintf(cap->bus_info, sizeof(cap->bus_info),
"platform:%s", vcap->vdev.v4l2_dev->name); "platform:%s", VIMC_PDEV_NAME);
return 0; return 0;
} }

2
drivers/media/platform/vimc/vimc-core.c
View File

@ -318,6 +318,8 @@ static int vimc_probe(struct platform_device *pdev)
/* Initialize media device */ /* Initialize media device */
strscpy(vimc->mdev.model, VIMC_MDEV_MODEL_NAME, strscpy(vimc->mdev.model, VIMC_MDEV_MODEL_NAME,
sizeof(vimc->mdev.model)); sizeof(vimc->mdev.model));
snprintf(vimc->mdev.bus_info, sizeof(vimc->mdev.bus_info),
"platform:%s", VIMC_PDEV_NAME);
vimc->mdev.dev = &pdev->dev; vimc->mdev.dev = &pdev->dev;
media_device_init(&vimc->mdev); media_device_init(&vimc->mdev);