Commit f2d8b691 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent cef69974

drivers/media/common/saa7146/saa7146_video.c

+0 −1
Original line number Diff line number Diff line
@@ -443,7 +443,6 @@ static int vidioc_querycap(struct file *file, void *fh, struct v4l2_capability * 


	strscpy((char *)cap->driver, "saa7146 v4l2", sizeof(cap->driver));

	strscpy((char *)cap->card, dev->ext->name, sizeof(cap->card));

	sprintf((char *)cap->bus_info, "PCI:%s", pci_name(dev->pci));

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OVERLAY |

			    V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

			    V4L2_CAP_DEVICE_CAPS;

drivers/media/pci/bt8xx/bttv-driver.c

+0 −2
Original line number Diff line number Diff line
@@ -2435,8 +2435,6 @@ static int bttv_querycap(struct file *file, void *priv, 


	strscpy(cap->driver, "bttv", sizeof(cap->driver));

	strscpy(cap->card, btv->video_dev.name, sizeof(cap->card));

	snprintf(cap->bus_info, sizeof(cap->bus_info),

		 "PCI:%s", pci_name(btv->c.pci));

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |

			    V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;

	if (no_overlay <= 0)

drivers/media/pci/cx18/cx18-ioctl.c

+0 −2
Original line number Diff line number Diff line
@@ -389,8 +389,6 @@ static int cx18_querycap(struct file *file, void *fh, 


	strscpy(vcap->driver, CX18_DRIVER_NAME, sizeof(vcap->driver));

	strscpy(vcap->card, cx->card_name, sizeof(vcap->card));

	snprintf(vcap->bus_info, sizeof(vcap->bus_info),

		 "PCI:%s", pci_name(cx->pci_dev));

	vcap->capabilities = cx->v4l2_cap | V4L2_CAP_DEVICE_CAPS;

	return 0;

}

drivers/media/pci/cx88/cx88-blackbird.c

+0 −1
Original line number Diff line number Diff line
@@ -796,7 +796,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	struct cx88_core *core = dev->core;



	strscpy(cap->driver, "cx88_blackbird", sizeof(cap->driver));

	sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));

	return cx88_querycap(file, core, cap);

}

drivers/media/pci/cx88/cx88-video.c

+0 −1
Original line number Diff line number Diff line
@@ -808,7 +808,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	struct cx88_core *core = dev->core;



	strscpy(cap->driver, "cx8800", sizeof(cap->driver));

	sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));

	return cx88_querycap(file, core, cap);

}