redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[media] hdpvr: 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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
wifi-calibration
Hans Verkuil 2015-03-09 13:34:09 -03:00 committed by Mauro Carvalho Chehab
parent dbe98b30d3
commit 4b30409b1b
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/usb/hdpvr/hdpvr-core.c
View File

@ -69,10 +69,6 @@ MODULE_DEVICE_TABLE(usb, hdpvr_table);
void hdpvr_delete(struct hdpvr_device *dev) void hdpvr_delete(struct hdpvr_device *dev)
{ {
hdpvr_free_buffers(dev); hdpvr_free_buffers(dev);
if (dev->video_dev)
video_device_release(dev->video_dev);
usb_put_dev(dev->udev); usb_put_dev(dev->udev);
} }
@ -397,7 +393,7 @@ static int hdpvr_probe(struct usb_interface *interface,
/* let the user know what node this device is now attached to */ /* let the user know what node this device is now attached to */
v4l2_info(&dev->v4l2_dev, "device now attached to %s\n", v4l2_info(&dev->v4l2_dev, "device now attached to %s\n",
video_device_node_name(dev->video_dev)); video_device_node_name(&dev->video_dev));
return 0; return 0;
reg_fail: reg_fail:
@ -420,7 +416,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
struct hdpvr_device *dev = to_hdpvr_dev(usb_get_intfdata(interface)); struct hdpvr_device *dev = to_hdpvr_dev(usb_get_intfdata(interface));
v4l2_info(&dev->v4l2_dev, "device %s disconnected\n", v4l2_info(&dev->v4l2_dev, "device %s disconnected\n",
video_device_node_name(dev->video_dev)); video_device_node_name(&dev->video_dev));
/* prevent more I/O from starting and stop any ongoing */ /* prevent more I/O from starting and stop any ongoing */
mutex_lock(&dev->io_mutex); mutex_lock(&dev->io_mutex);
dev->status = STATUS_DISCONNECTED; dev->status = STATUS_DISCONNECTED;
@ -436,7 +432,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
#if IS_ENABLED(CONFIG_I2C) #if IS_ENABLED(CONFIG_I2C)
i2c_del_adapter(&dev->i2c_adapter); i2c_del_adapter(&dev->i2c_adapter);
#endif #endif
video_unregister_device(dev->video_dev); video_unregister_device(&dev->video_dev);
atomic_dec(&dev_nr); atomic_dec(&dev_nr);
} }

19
drivers/media/usb/hdpvr/hdpvr-video.c
View File

@ -797,7 +797,7 @@ static int vidioc_s_input(struct file *file, void *_fh,
* Comment this out for now, but if the legacy mode can be * Comment this out for now, but if the legacy mode can be
* removed in the future, then this code should be enabled * removed in the future, then this code should be enabled
* again. * again.
dev->video_dev->tvnorms = dev->video_dev.tvnorms =
(index != HDPVR_COMPONENT) ? V4L2_STD_ALL : 0; (index != HDPVR_COMPONENT) ? V4L2_STD_ALL : 0;
*/ */
} }
@ -1228,19 +1228,12 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,
} }
/* setup and register video device */ /* setup and register video device */
dev->video_dev = video_device_alloc(); dev->video_dev = hdpvr_video_template;
if (!dev->video_dev) { strcpy(dev->video_dev.name, "Hauppauge HD PVR");
v4l2_err(&dev->v4l2_dev, "video_device_alloc() failed\n"); dev->video_dev.v4l2_dev = &dev->v4l2_dev;
res = -ENOMEM; video_set_drvdata(&dev->video_dev, dev);
goto error;
}
*dev->video_dev = hdpvr_video_template; res = video_register_device(&dev->video_dev, VFL_TYPE_GRABBER, devnum);
strcpy(dev->video_dev->name, "Hauppauge HD PVR");
dev->video_dev->v4l2_dev = &dev->v4l2_dev;
video_set_drvdata(dev->video_dev, dev);
res = video_register_device(dev->video_dev, VFL_TYPE_GRABBER, devnum);
if (res < 0) { if (res < 0) {
v4l2_err(&dev->v4l2_dev, "video_device registration failed\n"); v4l2_err(&dev->v4l2_dev, "video_device registration failed\n");
goto error; goto error;

2
drivers/media/usb/hdpvr/hdpvr.h
View File

@ -66,7 +66,7 @@ struct hdpvr_options {
/* Structure to hold all of our device specific stuff */ /* Structure to hold all of our device specific stuff */
struct hdpvr_device { struct hdpvr_device {
/* the v4l device for this device */ /* the v4l device for this device */
struct video_device *video_dev; struct video_device video_dev;
/* the control handler for this device */ /* the control handler for this device */
struct v4l2_ctrl_handler hdl; struct v4l2_ctrl_handler hdl;
/* the usb device for this device */ /* the usb device for this device */