diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2022-01-22 13:23:18 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-04-24 08:07:08 +0100 |
| commit | f2d8b6917f3bcfb3190eb80567fea71a9b59dbd3 (patch) | |
| tree | e3909757b20eed89588b2be2ba593d0db4901a16 /drivers/media/pci/solo6x10 | |
| parent | cef699749f3789add5ecaf0a2f73a659cae1c7ae (diff) | |
| download | lwn-f2d8b6917f3bcfb3190eb80567fea71a9b59dbd3.tar.gz lwn-f2d8b6917f3bcfb3190eb80567fea71a9b59dbd3.zip | |
media: v4l: ioctl: Set bus_info in v4l_querycap()
The bus_info field is set by most drivers based on the type of the device
bus as well as the name of the device. Do this in v4l_querycap() so
drivers don't need to. This keeps compatibility with non-default and silly
bus_info.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/pci/solo6x10')
| -rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 3 | ||||
| -rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c index 7766cadb73ea..80d20e2a2099 100644 --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c @@ -764,13 +764,10 @@ static int solo_enc_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { struct solo_enc_dev *solo_enc = video_drvdata(file); - struct solo_dev *solo_dev = solo_enc->solo_dev; strscpy(cap->driver, SOLO6X10_NAME, sizeof(cap->driver)); snprintf(cap->card, sizeof(cap->card), "Softlogic 6x10 Enc %d", solo_enc->ch); - snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", - pci_name(solo_dev->pdev)); return 0; } diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2.c b/drivers/media/pci/solo6x10/solo6x10-v4l2.c index 24ef0c446bef..e18cc41fca83 100644 --- a/drivers/media/pci/solo6x10/solo6x10-v4l2.c +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2.c @@ -372,12 +372,8 @@ static const struct vb2_ops solo_video_qops = { static int solo_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { - struct solo_dev *solo_dev = video_drvdata(file); - strscpy(cap->driver, SOLO6X10_NAME, sizeof(cap->driver)); strscpy(cap->card, "Softlogic 6x10", sizeof(cap->card)); - snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", - pci_name(solo_dev->pdev)); return 0; } |