Skip to content

L
linux
Commit d4352f36 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files
Options

[media] em28xx: embed video_device 

Embed the video_device struct to simplify the error handling and in
order to (eventually) get rid of video_device_alloc/release.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 23fb4c5e
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 71 deletions
drivers/media/usb/em28xx/em28xx-video.c
View file @ d4352f36
...@@ -1472,7 +1472,7 @@ static int vidioc_enum_input(struct file *file, void *priv, ...@@ -1472,7 +1472,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
(EM28XX_VMUX_CABLE == INPUT(n)->type)) (EM28XX_VMUX_CABLE == INPUT(n)->type))
i->type = V4L2_INPUT_TYPE_TUNER; i->type = V4L2_INPUT_TYPE_TUNER;
i->std = dev->v4l2->vdev->tvnorms; i->std = dev->v4l2->vdev.tvnorms;
/* webcams do not have the STD API */ /* webcams do not have the STD API */
if (dev->board.is_webcam) if (dev->board.is_webcam)
i->capabilities = 0; i->capabilities = 0;
...@@ -1730,9 +1730,9 @@ static int vidioc_querycap(struct file *file, void *priv, ...@@ -1730,9 +1730,9 @@ static int vidioc_querycap(struct file *file, void *priv,
cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS |
V4L2_CAP_READWRITE | V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; V4L2_CAP_READWRITE | V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
if (v4l2->vbi_dev) if (video_is_registered(&v4l2->vbi_dev))
cap->capabilities |= V4L2_CAP_VBI_CAPTURE; cap->capabilities |= V4L2_CAP_VBI_CAPTURE;
if (v4l2->radio_dev) if (video_is_registered(&v4l2->radio_dev))
cap->capabilities |= V4L2_CAP_RADIO; cap->capabilities |= V4L2_CAP_RADIO;
return 0; return 0;
} }
...@@ -1966,20 +1966,20 @@ static int em28xx_v4l2_fini(struct em28xx *dev) ...@@ -1966,20 +1966,20 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE); em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
if (v4l2->radio_dev) { if (video_is_registered(&v4l2->radio_dev)) {
em28xx_info("V4L2 device %s deregistered\n", em28xx_info("V4L2 device %s deregistered\n",
video_device_node_name(v4l2->radio_dev)); video_device_node_name(&v4l2->radio_dev));
video_unregister_device(v4l2->radio_dev); video_unregister_device(&v4l2->radio_dev);
} }
if (v4l2->vbi_dev) { if (video_is_registered(&v4l2->vbi_dev)) {
em28xx_info("V4L2 device %s deregistered\n", em28xx_info("V4L2 device %s deregistered\n",
video_device_node_name(v4l2->vbi_dev)); video_device_node_name(&v4l2->vbi_dev));
video_unregister_device(v4l2->vbi_dev); video_unregister_device(&v4l2->vbi_dev);
} }
if (v4l2->vdev) { if (video_is_registered(&v4l2->vdev)) {
em28xx_info("V4L2 device %s deregistered\n", em28xx_info("V4L2 device %s deregistered\n",
video_device_node_name(v4l2->vdev)); video_device_node_name(&v4l2->vdev));
video_unregister_device(v4l2->vdev); video_unregister_device(&v4l2->vdev);
} }
v4l2_ctrl_handler_free(&v4l2->ctrl_handler); v4l2_ctrl_handler_free(&v4l2->ctrl_handler);
...@@ -2127,7 +2127,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { ...@@ -2127,7 +2127,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
static const struct video_device em28xx_video_template = { static const struct video_device em28xx_video_template = {
.fops = &em28xx_v4l_fops, .fops = &em28xx_v4l_fops,
.ioctl_ops = &video_ioctl_ops, .ioctl_ops = &video_ioctl_ops,
.release = video_device_release, .release = video_device_release_empty,
.tvnorms = V4L2_STD_ALL, .tvnorms = V4L2_STD_ALL,
}; };
...@@ -2156,7 +2156,7 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = { ...@@ -2156,7 +2156,7 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
static struct video_device em28xx_radio_template = { static struct video_device em28xx_radio_template = {
.fops = &radio_fops, .fops = &radio_fops,
.ioctl_ops = &radio_ioctl_ops, .ioctl_ops = &radio_ioctl_ops,
.release = video_device_release, .release = video_device_release_empty,
}; };
/* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */ /* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */
...@@ -2179,17 +2179,11 @@ static unsigned short msp3400_addrs[] = { ...@@ -2179,17 +2179,11 @@ static unsigned short msp3400_addrs[] = {
/******************************** usb interface ******************************/ /******************************** usb interface ******************************/
static struct video_device static void em28xx_vdev_init(struct em28xx *dev,
*em28xx_vdev_init(struct em28xx *dev, struct video_device *vfd,
const struct video_device *template, const struct video_device *template,
const char *type_name) const char *type_name)
{ {
struct video_device *vfd;
vfd = video_device_alloc();
if (NULL == vfd)
return NULL;
*vfd = *template; *vfd = *template;
vfd->v4l2_dev = &dev->v4l2->v4l2_dev; vfd->v4l2_dev = &dev->v4l2->v4l2_dev;
vfd->lock = &dev->lock; vfd->lock = &dev->lock;
...@@ -2200,7 +2194,6 @@ static struct video_device ...@@ -2200,7 +2194,6 @@ static struct video_device
dev->name, type_name); dev->name, type_name);
video_set_drvdata(vfd, dev); video_set_drvdata(vfd, dev);
return vfd;
} }
static void em28xx_tuner_setup(struct em28xx *dev, unsigned short tuner_addr) static void em28xx_tuner_setup(struct em28xx *dev, unsigned short tuner_addr)
...@@ -2491,38 +2484,33 @@ static int em28xx_v4l2_init(struct em28xx *dev) ...@@ -2491,38 +2484,33 @@ static int em28xx_v4l2_init(struct em28xx *dev)
goto unregister_dev; goto unregister_dev;
/* allocate and fill video video_device struct */ /* allocate and fill video video_device struct */
v4l2->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video"); em28xx_vdev_init(dev, &v4l2->vdev, &em28xx_video_template, "video");
if (!v4l2->vdev) {
em28xx_errdev("cannot allocate video_device.\n");
ret = -ENODEV;
goto unregister_dev;
}
mutex_init(&v4l2->vb_queue_lock); mutex_init(&v4l2->vb_queue_lock);
mutex_init(&v4l2->vb_vbi_queue_lock); mutex_init(&v4l2->vb_vbi_queue_lock);
v4l2->vdev->queue = &v4l2->vb_vidq; v4l2->vdev.queue = &v4l2->vb_vidq;
v4l2->vdev->queue->lock = &v4l2->vb_queue_lock; v4l2->vdev.queue->lock = &v4l2->vb_queue_lock;
/* disable inapplicable ioctls */ /* disable inapplicable ioctls */
if (dev->board.is_webcam) { if (dev->board.is_webcam) {
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_QUERYSTD); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_QUERYSTD);
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_G_STD); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_G_STD);
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_S_STD); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_S_STD);
} else { } else {
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_S_PARM); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_S_PARM);
} }
if (dev->tuner_type == TUNER_ABSENT) { if (dev->tuner_type == TUNER_ABSENT) {
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_G_TUNER); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_G_TUNER);
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_S_TUNER); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_S_TUNER);
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_G_FREQUENCY); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_G_FREQUENCY);
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_S_FREQUENCY); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_S_FREQUENCY);
} }
if (dev->int_audio_type == EM28XX_INT_AUDIO_NONE) { if (dev->int_audio_type == EM28XX_INT_AUDIO_NONE) {
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_G_AUDIO); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_G_AUDIO);
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_S_AUDIO); v4l2_disable_ioctl(&v4l2->vdev, VIDIOC_S_AUDIO);
} }
/* register v4l2 video video_device */ /* register v4l2 video video_device */
ret = video_register_device(v4l2->vdev, VFL_TYPE_GRABBER, ret = video_register_device(&v4l2->vdev, VFL_TYPE_GRABBER,
video_nr[dev->devno]); video_nr[dev->devno]);
if (ret) { if (ret) {
em28xx_errdev("unable to register video device (error=%i).\n", em28xx_errdev("unable to register video device (error=%i).\n",
...@@ -2532,27 +2520,27 @@ static int em28xx_v4l2_init(struct em28xx *dev) ...@@ -2532,27 +2520,27 @@ static int em28xx_v4l2_init(struct em28xx *dev)
/* Allocate and fill vbi video_device struct */ /* Allocate and fill vbi video_device struct */
if (em28xx_vbi_supported(dev) == 1) { if (em28xx_vbi_supported(dev) == 1) {
v4l2->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, em28xx_vdev_init(dev, &v4l2->vbi_dev, &em28xx_video_template,
"vbi"); "vbi");
v4l2->vbi_dev->queue = &v4l2->vb_vbiq; v4l2->vbi_dev.queue = &v4l2->vb_vbiq;
v4l2->vbi_dev->queue->lock = &v4l2->vb_vbi_queue_lock; v4l2->vbi_dev.queue->lock = &v4l2->vb_vbi_queue_lock;
/* disable inapplicable ioctls */ /* disable inapplicable ioctls */
v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_S_PARM); v4l2_disable_ioctl(&v4l2->vbi_dev, VIDIOC_S_PARM);
if (dev->tuner_type == TUNER_ABSENT) { if (dev->tuner_type == TUNER_ABSENT) {
v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_G_TUNER); v4l2_disable_ioctl(&v4l2->vbi_dev, VIDIOC_G_TUNER);
v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_S_TUNER); v4l2_disable_ioctl(&v4l2->vbi_dev, VIDIOC_S_TUNER);
v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_G_FREQUENCY); v4l2_disable_ioctl(&v4l2->vbi_dev, VIDIOC_G_FREQUENCY);
v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_S_FREQUENCY); v4l2_disable_ioctl(&v4l2->vbi_dev, VIDIOC_S_FREQUENCY);
} }
if (dev->int_audio_type == EM28XX_INT_AUDIO_NONE) { if (dev->int_audio_type == EM28XX_INT_AUDIO_NONE) {
v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_G_AUDIO); v4l2_disable_ioctl(&v4l2->vbi_dev, VIDIOC_G_AUDIO);
v4l2_disable_ioctl(v4l2->vbi_dev, VIDIOC_S_AUDIO); v4l2_disable_ioctl(&v4l2->vbi_dev, VIDIOC_S_AUDIO);
} }
/* register v4l2 vbi video_device */ /* register v4l2 vbi video_device */
ret = video_register_device(v4l2->vbi_dev, VFL_TYPE_VBI, ret = video_register_device(&v4l2->vbi_dev, VFL_TYPE_VBI,
vbi_nr[dev->devno]); vbi_nr[dev->devno]);
if (ret < 0) { if (ret < 0) {
em28xx_errdev("unable to register vbi device\n"); em28xx_errdev("unable to register vbi device\n");
...@@ -2561,29 +2549,24 @@ static int em28xx_v4l2_init(struct em28xx *dev) ...@@ -2561,29 +2549,24 @@ static int em28xx_v4l2_init(struct em28xx *dev)
} }
if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) { if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
v4l2->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, em28xx_vdev_init(dev, &v4l2->radio_dev, &em28xx_radio_template,
"radio"); "radio");
if (!v4l2->radio_dev) { ret = video_register_device(&v4l2->radio_dev, VFL_TYPE_RADIO,
em28xx_errdev("cannot allocate video_device.\n");
ret = -ENODEV;
goto unregister_dev;
}
ret = video_register_device(v4l2->radio_dev, VFL_TYPE_RADIO,
radio_nr[dev->devno]); radio_nr[dev->devno]);
if (ret < 0) { if (ret < 0) {
em28xx_errdev("can't register radio device\n"); em28xx_errdev("can't register radio device\n");
goto unregister_dev; goto unregister_dev;
} }
em28xx_info("Registered radio device as %s\n", em28xx_info("Registered radio device as %s\n",
video_device_node_name(v4l2->radio_dev)); video_device_node_name(&v4l2->radio_dev));
} }
em28xx_info("V4L2 video device registered as %s\n", em28xx_info("V4L2 video device registered as %s\n",
video_device_node_name(v4l2->vdev)); video_device_node_name(&v4l2->vdev));
if (v4l2->vbi_dev) if (video_is_registered(&v4l2->vbi_dev))
em28xx_info("V4L2 VBI device registered as %s\n", em28xx_info("V4L2 VBI device registered as %s\n",
video_device_node_name(v4l2->vbi_dev)); video_device_node_name(&v4l2->vbi_dev));
/* Save some power by putting tuner to sleep */ /* Save some power by putting tuner to sleep */
v4l2_device_call_all(&v4l2->v4l2_dev, 0, core, s_power, 0); v4l2_device_call_all(&v4l2->v4l2_dev, 0, core, s_power, 0);
......
drivers/media/usb/em28xx/em28xx.h
View file @ d4352f36
...@@ -513,9 +513,9 @@ struct em28xx_v4l2 { ...@@ -513,9 +513,9 @@ struct em28xx_v4l2 {
struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_clk *clk; struct v4l2_clk *clk;
struct video_device *vdev; struct video_device vdev;
struct video_device *vbi_dev; struct video_device vbi_dev;
struct video_device *radio_dev; struct video_device radio_dev;
/* Videobuf2 */ /* Videobuf2 */
struct vb2_queue vb_vidq; struct vb2_queue vb_vidq;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7