Skip to contentSkip to conversation

usbvision: use usb_make_path to report bus info

PATCH Applied Thierry Merle 3 participants 7 messages Jan 20, 2009 – Jan 21, 2009 Media (V4L/DVB)

lore
Share & tools
lore
author
#1 lore raw

PATCH 2/5 em28xx: use usb_make_path to report bus info

In reply to Thierry Merle

usb_make_path reports canonical bus info. Use it when reporting bus info in VIDIOC_QUERYCAP.

Signed-off-by Thierry MERLE <[email protected]>
linux/drivers/media/video/em28xx/em28xx-video.c +2 -2
diff -r 306881b74bb9 -r 6ac9dc705aea linux/drivers/media/video/em28xx/em28xx-video.c
@@ -1355,7 +1355,7 @@
 
 	strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
 	strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));
-	strlcpy(cap->bus_info, dev_name(&dev->udev->dev), sizeof(cap->bus_info));
+	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
 
 	cap->version = EM28XX_VERSION_CODE;
 

@@ -1543,7 +1543,7 @@
 
 	strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
 	strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));
-	strlcpy(cap->bus_info, dev_name(&dev->udev->dev), sizeof(cap->bus_info));
+	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
 
 	cap->version = EM28XX_VERSION_CODE;
 	cap->capabilities = V4L2_CAP_TUNER;
author
#4 lore raw

PATCH 4/5 uvcvideo: use usb_make_path to report bus info

In reply to Thierry Merle

usb_make_path reports canonical bus info. Use it when reporting bus info in VIDIOC_QUERYCAP.

Signed-off-by Thierry MERLE <[email protected]>
linux/drivers/media/video/uvc/uvc_v4l2.c +1 -2
diff -r 72ba48adaacd -r 43bb285afc52 linux/drivers/media/video/uvc/uvc_v4l2.c
@@ -494,8 +494,7 @@
 		memset(cap, 0, sizeof *cap);
 		strncpy(cap->driver, "uvcvideo", sizeof cap->driver);
 		strncpy(cap->card, vdev->name, 32);
-		strncpy(cap->bus_info, video->dev->udev->bus->bus_name,
-			sizeof cap->bus_info);
+		usb_make_path(video->dev->udev, cap->bus_info, sizeof(cap->bus_info));
 		cap->version = DRIVER_VERSION_NUMBER;
 		if (video->streaming->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
 			cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
author
#2 lore raw

PATCH 3/5 gspca: use usb_make_path to report bus info

In reply to Thierry Merle

usb_make_path reports canonical bus info. Use it when reporting bus info in VIDIOC_QUERYCAP.

Signed-off-by Thierry MERLE <[email protected]>
linux/drivers/media/video/gspca/gspca.c +1 -2
diff -r 6ac9dc705aea -r 72ba48adaacd linux/drivers/media/video/gspca/gspca.c
@@ -977,8 +977,7 @@
 			le16_to_cpu(gspca_dev->dev->descriptor.idVendor),
 			le16_to_cpu(gspca_dev->dev->descriptor.idProduct));
 	}
-	strncpy(cap->bus_info, gspca_dev->dev->bus->bus_name,
-		sizeof cap->bus_info);
+	usb_make_path(gspca_dev->dev, cap->bus_info, sizeof(cap->bus_info));
 	cap->version = DRIVER_VERSION_NUMBER;
 	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
 			  | V4L2_CAP_STREAMING
author
#6 lore raw

PATCH 5/5 s2255drv: use usb_make_path to report bus info

In reply to Thierry Merle

usb_make_path reports canonical bus info. Use it when reporting bus info in VIDIOC_QUERYCAP.

Signed-off-by Thierry MERLE <[email protected]>
linux/drivers/media/video/s2255drv.c +1 -2
diff -r 43bb285afc52 -r 6adb3130678d linux/drivers/media/video/s2255drv.c
@@ -842,8 +842,7 @@
 	struct s2255_dev *dev = fh->dev;
 	strlcpy(cap->driver, "s2255", sizeof(cap->driver));
 	strlcpy(cap->card, "s2255", sizeof(cap->card));
-	strlcpy(cap->bus_info, dev_name(&dev->udev->dev),
-		sizeof(cap->bus_info));
+	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
 	cap->version = S2255_VERSION;
 	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
 	return 0;

Thierry Merle

author
#0 lore raw

PATCH 1/5 usbvision: use usb_make_path to report bus info

Hello,
Here is the set of patches that makes usb driver use usb_make_path to report bus info (except for pvrusb2 since Mike said he would do the patch) I would like to have a Acked-by for these patches before doing a pull request, to be sure I did not do weird things. Thanks
Cheers,
Thierry

usb_make_path reports canonical bus info. Use it when reporting bus info in VIDIOC_QUERYCAP.

Signed-off-by Thierry MERLE <[email protected]>

---

linux/drivers/media/video/usbvision/usbvision-video.c +1 -2
diff -r f4d7d0b84940 -r 306881b74bb9 linux/drivers/media/video/usbvision/usbvision-video.c
@@ -524,8 +524,7 @@
 	strlcpy(vc->card,
 		usbvision_device_data[usbvision->DevModel].ModelString,
 		sizeof(vc->card));
-	strlcpy(vc->bus_info, dev_name(&usbvision->dev->dev),
-		sizeof(vc->bus_info));
+	usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info));
 	vc->version = USBVISION_DRIVER_VERSION;
 	vc->capabilities = V4L2_CAP_VIDEO_CAPTURE |
 		V4L2_CAP_AUDIO |
Acked-by on v1 4/5
#5 lore raw

Re: [PATCH 4/5] uvcvideo: use usb_make_path to report bus info

In reply to Thierry Merle

Hi Thierry,

Quoted 10 lines · Thierry Merle

usb_make_path reports canonical bus info. Use it when reporting bus info in VIDIOC_QUERYCAP.

Signed-off-by Thierry MERLE <[email protected]>

diff -r 72ba48adaacd -r 43bb285afc52
linux/drivers/media/video/uvc/uvc_v4l2.c ---
a/linux/drivers/media/video/uvc/uvc_v4l2.c Tue Jan 20 22:06:58 2009 +0100
+++ b/linux/drivers/media/video/uvc/uvc_v4l2.c Tue Jan 20 22:13:45 2009
+0100 @@ -494,8 +494,7 @@

linux/drivers/media/video/uvc/uvc_v4l2.c line 497

Quoted 6 lines
linux/drivers/media/video/uvc/uvc_v4l2.c +1 -2
 		memset(cap, 0, sizeof *cap);
 		strncpy(cap->driver, "uvcvideo", sizeof cap->driver);
 		strncpy(cap->card, vdev->name, 32);
-		strncpy(cap->bus_info, video->dev->udev->bus->bus_name,
-			sizeof cap->bus_info);
+		usb_make_path(video->dev->udev, cap->bus_info, sizeof(cap->bus_info));

This overflows the 80 columns limit, could you please split the statement ?

+ usb_make_path(video->dev->udev, cap->bus_info,
+ sizeof(cap->bus_info));

linux/drivers/media/video/uvc/uvc_v4l2.c line 500

Quoted 3 lines
linux/drivers/media/video/uvc/uvc_v4l2.c +0 -0
 		cap->version = DRIVER_VERSION_NUMBER;
 		if (video->streaming->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
 			cap->capabilities = V4L2_CAP_VIDEO_CAPTURE

Apart from that,

Acked-by Laurent Pinchart <[email protected]>

and thanks for the patch.