Commit 8c3854d0 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: media/usb: set device_caps in struct video_device 



Instead of filling in the struct v4l2_capability device_caps
field, fill in the struct video_device device_caps field.

That way the V4L2 core knows what the capabilities of the
video device are.

But this only really works if all drivers use this, so convert
all usb drivers in this patch.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent e83ce300

drivers/media/usb/airspy/airspy.c

+2 −4
Original line number Diff line number Diff line
@@ -622,10 +622,6 @@ static int airspy_querycap(struct file *file, void *fh, 
	strscpy(cap->driver, KBUILD_MODNAME, sizeof(cap->driver));

	strscpy(cap->card, s->vdev.name, sizeof(cap->card));

	usb_make_path(s->udev, cap->bus_info, sizeof(cap->bus_info));

	cap->device_caps = V4L2_CAP_SDR_CAPTURE | V4L2_CAP_STREAMING |

			V4L2_CAP_READWRITE | V4L2_CAP_TUNER;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;



	return 0;

}
@@ -1066,6 +1062,8 @@ static int airspy_probe(struct usb_interface *intf, 
	s->v4l2_dev.ctrl_handler = &s->hdl;

	s->vdev.v4l2_dev = &s->v4l2_dev;

	s->vdev.lock = &s->v4l2_lock;

	s->vdev.device_caps = V4L2_CAP_SDR_CAPTURE | V4L2_CAP_STREAMING |

			      V4L2_CAP_READWRITE | V4L2_CAP_TUNER;



	ret = video_register_device(&s->vdev, VFL_TYPE_SDR, -1);

	if (ret) {

drivers/media/usb/au0828/au0828-video.c

+10 −11
Original line number Diff line number Diff line
@@ -1191,7 +1191,6 @@ static int au0828_set_format(struct au0828_dev *dev, unsigned int cmd, 
static int vidioc_querycap(struct file *file, void  *priv,

			   struct v4l2_capability *cap)

{

	struct video_device *vdev = video_devdata(file);

	struct au0828_dev *dev = video_drvdata(file);



	dprintk(1, "%s called std_set %d dev_state %ld\n", __func__,
@@ -1202,16 +1201,10 @@ static int vidioc_querycap(struct file *file, void *priv, 
	usb_make_path(dev->usbdev, cap->bus_info, sizeof(cap->bus_info));



	/* set the device capabilities */

	cap->device_caps = V4L2_CAP_AUDIO |

		V4L2_CAP_READWRITE |

		V4L2_CAP_STREAMING |

		V4L2_CAP_TUNER;

	if (vdev->vfl_type == VFL_TYPE_GRABBER)

		cap->device_caps |= V4L2_CAP_VIDEO_CAPTURE;

	else

		cap->device_caps |= V4L2_CAP_VBI_CAPTURE;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS |

		V4L2_CAP_VBI_CAPTURE | V4L2_CAP_VIDEO_CAPTURE;

	cap->capabilities =

		V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

		V4L2_CAP_TUNER | V4L2_CAP_VBI_CAPTURE | V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_DEVICE_CAPS;

	return 0;

}
@@ -2000,6 +1993,9 @@ int au0828_analog_register(struct au0828_dev *dev, 
	dev->vdev.lock = &dev->lock;

	dev->vdev.queue = &dev->vb_vidq;

	dev->vdev.queue->lock = &dev->vb_queue_lock;

	dev->vdev.device_caps =

		V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

		V4L2_CAP_TUNER | V4L2_CAP_VIDEO_CAPTURE;

	strscpy(dev->vdev.name, "au0828a video", sizeof(dev->vdev.name));



	/* Setup the VBI device */
@@ -2008,6 +2004,9 @@ int au0828_analog_register(struct au0828_dev *dev, 
	dev->vbi_dev.lock = &dev->lock;

	dev->vbi_dev.queue = &dev->vb_vbiq;

	dev->vbi_dev.queue->lock = &dev->vb_vbi_queue_lock;

	dev->vbi_dev.device_caps =

		V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

		V4L2_CAP_TUNER | V4L2_CAP_VBI_CAPTURE;

	strscpy(dev->vbi_dev.name, "au0828a vbi", sizeof(dev->vbi_dev.name));



	/* Init entities at the Media Controller */

drivers/media/usb/cpia2/cpia2_v4l.c

+2 −7
Original line number Diff line number Diff line
@@ -259,13 +259,6 @@ static int cpia2_querycap(struct file *file, void *fh, struct v4l2_capability *v 


	if (usb_make_path(cam->dev, vc->bus_info, sizeof(vc->bus_info)) <0)

		memset(vc->bus_info,0, sizeof(vc->bus_info));



	vc->device_caps = V4L2_CAP_VIDEO_CAPTURE |

			   V4L2_CAP_READWRITE |

			   V4L2_CAP_STREAMING;

	vc->capabilities = vc->device_caps |

			   V4L2_CAP_DEVICE_CAPS;



	return 0;

}
@@ -1161,6 +1154,8 @@ int cpia2_register_camera(struct camera_data *cam) 
	cam->vdev.lock = &cam->v4l2_lock;

	cam->vdev.ctrl_handler = hdl;

	cam->vdev.v4l2_dev = &cam->v4l2_dev;

	cam->vdev.device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |

				V4L2_CAP_STREAMING;



	reset_camera_struct_v4l(cam);

drivers/media/usb/cx231xx/cx231xx-video.c

+14 −14
Original line number Diff line number Diff line
@@ -1555,30 +1555,19 @@ static int vidioc_streamoff(struct file *file, void *priv, 
int cx231xx_querycap(struct file *file, void *priv,

			   struct v4l2_capability *cap)

{

	struct video_device *vdev = video_devdata(file);

	struct cx231xx_fh *fh = priv;

	struct cx231xx *dev = fh->dev;



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

	strscpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card));

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



	if (vdev->vfl_type == VFL_TYPE_RADIO)

		cap->device_caps = V4L2_CAP_RADIO;

	else {

		cap->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;

		if (vdev->vfl_type == VFL_TYPE_VBI)

			cap->device_caps |= V4L2_CAP_VBI_CAPTURE;

		else

			cap->device_caps |= V4L2_CAP_VIDEO_CAPTURE;

	}

	if (dev->tuner_type != TUNER_ABSENT)

		cap->device_caps |= V4L2_CAP_TUNER;

	cap->capabilities = cap->device_caps | V4L2_CAP_READWRITE |

	cap->capabilities = V4L2_CAP_READWRITE |

		V4L2_CAP_VBI_CAPTURE | V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;

	if (video_is_registered(&dev->radio_dev))

		cap->capabilities |= V4L2_CAP_RADIO;

	if (dev->tuner_type != TUNER_ABSENT)

		cap->capabilities |= V4L2_CAP_TUNER;



	return 0;

}
@@ -2234,6 +2223,11 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) 
		dev_err(dev->dev, "failed to initialize video media entity!\n");

#endif

	dev->vdev.ctrl_handler = &dev->ctrl_handler;

	dev->vdev.device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

				V4L2_CAP_VIDEO_CAPTURE;

	if (dev->tuner_type != TUNER_ABSENT)

		dev->vdev.device_caps |= V4L2_CAP_TUNER;



	/* register v4l2 video video_device */

	ret = video_register_device(&dev->vdev, VFL_TYPE_GRABBER,

				    video_nr[dev->devno]);
@@ -2262,6 +2256,11 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) 
		dev_err(dev->dev, "failed to initialize vbi media entity!\n");

#endif

	dev->vbi_dev.ctrl_handler = &dev->ctrl_handler;

	dev->vbi_dev.device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

				   V4L2_CAP_VBI_CAPTURE;

	if (dev->tuner_type != TUNER_ABSENT)

		dev->vbi_dev.device_caps |= V4L2_CAP_TUNER;



	/* register v4l2 vbi video_device */

	ret = video_register_device(&dev->vbi_dev, VFL_TYPE_VBI,

				    vbi_nr[dev->devno]);
@@ -2277,6 +2276,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) 
		cx231xx_vdev_init(dev, &dev->radio_dev,

				&cx231xx_radio_template, "radio");

		dev->radio_dev.ctrl_handler = &dev->radio_ctrl_handler;

		dev->radio_dev.device_caps = V4L2_CAP_RADIO | V4L2_CAP_TUNER;

		ret = video_register_device(&dev->radio_dev, VFL_TYPE_RADIO,

					    radio_nr[dev->devno]);

		if (ret < 0) {

drivers/media/usb/em28xx/em28xx-video.c

+16 −16
Original line number Diff line number Diff line
@@ -1984,7 +1984,6 @@ static int vidioc_s_register(struct file *file, void *priv, 
static int vidioc_querycap(struct file *file, void  *priv,

			   struct v4l2_capability *cap)

{

	struct video_device   *vdev = video_devdata(file);

	struct em28xx         *dev  = video_drvdata(file);

	struct em28xx_v4l2    *v4l2 = dev->v4l2;

	struct usb_device *udev = interface_to_usbdev(dev->intf);
@@ -1993,23 +1992,12 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strscpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));

	usb_make_path(udev, cap->bus_info, sizeof(cap->bus_info));



	if (vdev->vfl_type == VFL_TYPE_GRABBER)

		cap->device_caps = V4L2_CAP_READWRITE |

	cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_READWRITE |

			    V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	else if (vdev->vfl_type == VFL_TYPE_RADIO)

		cap->device_caps = V4L2_CAP_RADIO;

	else

		cap->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE;



	if (dev->int_audio_type != EM28XX_INT_AUDIO_NONE)

		cap->device_caps |= V4L2_CAP_AUDIO;



		cap->capabilities |= V4L2_CAP_AUDIO;

	if (dev->tuner_type != TUNER_ABSENT)

		cap->device_caps |= V4L2_CAP_TUNER;



	cap->capabilities = cap->device_caps |

			    V4L2_CAP_DEVICE_CAPS | V4L2_CAP_READWRITE |

			    V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

		cap->capabilities |= V4L2_CAP_TUNER;

	if (video_is_registered(&v4l2->vbi_dev))

		cap->capabilities |= V4L2_CAP_VBI_CAPTURE;

	if (video_is_registered(&v4l2->radio_dev))
@@ -2782,6 +2770,13 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	mutex_init(&v4l2->vb_vbi_queue_lock);

	v4l2->vdev.queue = &v4l2->vb_vidq;

	v4l2->vdev.queue->lock = &v4l2->vb_queue_lock;

	v4l2->vdev.device_caps = V4L2_CAP_READWRITE | V4L2_CAP_VIDEO_CAPTURE |

				 V4L2_CAP_STREAMING;

	if (dev->int_audio_type != EM28XX_INT_AUDIO_NONE)

		v4l2->vdev.device_caps |= V4L2_CAP_AUDIO;

	if (dev->tuner_type != TUNER_ABSENT)

		v4l2->vdev.device_caps |= V4L2_CAP_TUNER;





	/* disable inapplicable ioctls */

	if (dev->is_webcam) {
@@ -2818,6 +2813,10 @@ static int em28xx_v4l2_init(struct em28xx *dev) 


		v4l2->vbi_dev.queue = &v4l2->vb_vbiq;

		v4l2->vbi_dev.queue->lock = &v4l2->vb_vbi_queue_lock;

		v4l2->vbi_dev.device_caps = V4L2_CAP_STREAMING |

			V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE;

		if (dev->tuner_type != TUNER_ABSENT)

			v4l2->vbi_dev.device_caps |= V4L2_CAP_TUNER;



		/* disable inapplicable ioctls */

		v4l2_disable_ioctl(&v4l2->vbi_dev, VIDIOC_S_PARM);
@@ -2845,6 +2844,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) 
	if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {

		em28xx_vdev_init(dev, &v4l2->radio_dev, &em28xx_radio_template,

				 "radio");

		v4l2->radio_dev.device_caps = V4L2_CAP_RADIO | V4L2_CAP_TUNER;

		ret = video_register_device(&v4l2->radio_dev, VFL_TYPE_RADIO,

					    radio_nr[dev->devno]);

		if (ret < 0) {