* [RFT v2] stk-webcam: Fix video_device handling
@ 2008-06-29 1:40 David Ellingsworth
2008-06-29 22:34 ` David Ellingsworth
0 siblings, 1 reply; 6+ messages in thread
From: David Ellingsworth @ 2008-06-29 1:40 UTC (permalink / raw)
To: video4linux-list, Jaime Velasco Juan
This patch updates stk-webcam to properly alloc the video_device
struct using video_device_alloc() and free it using
video_device_release(). The patch to properly reference count the
video_device struct should be applied with this one for testing.
Regards,
David Ellingsworth
---
drivers/media/video/stk-webcam.c | 107 ++++++++++++++-----------------------
drivers/media/video/stk-webcam.h | 3 +-
2 files changed, 42 insertions(+), 68 deletions(-)
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index b12c60c..1bd295a 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -68,11 +68,6 @@ static void stk_camera_cleanup(struct kref *kref)
{
struct stk_camera *dev = to_stk_camera(kref);
- STK_INFO("Syntek USB2.0 Camera release resources"
- " video device /dev/video%d\n", dev->vdev.minor);
- video_unregister_device(&dev->vdev);
- dev->vdev.priv = NULL;
-
if (dev->sio_bufs != NULL || dev->isobufs != NULL)
STK_ERROR("We are leaking memory\n");
usb_put_intf(dev->interface);
@@ -255,7 +250,7 @@ static ssize_t show_brightness(struct device *class,
struct device_attribute *attr, char *buf)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
return sprintf(buf, "%X\n", dev->vsettings.brightness);
}
@@ -268,7 +263,7 @@ static ssize_t store_brightness(struct device *class,
int ret;
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
value = simple_strtoul(buf, &endp, 16);
@@ -285,7 +280,7 @@ static ssize_t show_hflip(struct device *class,
struct device_attribute *attr, char *buf)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
return sprintf(buf, "%d\n", dev->vsettings.hflip);
}
@@ -294,7 +289,7 @@ static ssize_t store_hflip(struct device *class,
struct device_attribute *attr, const char *buf, size_t count)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
if (strncmp(buf, "1", 1) == 0)
dev->vsettings.hflip = 1;
@@ -310,7 +305,7 @@ static ssize_t show_vflip(struct device *class,
struct device_attribute *attr, char *buf)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
return sprintf(buf, "%d\n", dev->vsettings.vflip);
}
@@ -319,7 +314,7 @@ static ssize_t store_vflip(struct device *class,
struct device_attribute *attr, const char *buf, size_t count)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
if (strncmp(buf, "1", 1) == 0)
dev->vsettings.vflip = 1;
@@ -683,11 +678,11 @@ static int v4l_stk_open(struct inode *inode,
struct file *fp)
struct video_device *vdev;
vdev = video_devdata(fp);
- dev = vdev_to_camera(vdev);
+ dev = dev_get_drvdata(vdev->dev);
if (dev == NULL || !is_present(dev))
return -ENXIO;
- fp->private_data = vdev;
+ fp->private_data = dev;
kref_get(&dev->kref);
usb_autopm_get_interface(dev->interface);
@@ -696,19 +691,7 @@ static int v4l_stk_open(struct inode *inode,
struct file *fp)
static int v4l_stk_release(struct inode *inode, struct file *fp)
{
- struct stk_camera *dev;
- struct video_device *vdev;
-
- vdev = video_devdata(fp);
- if (vdev == NULL) {
- STK_ERROR("v4l_release called w/o video devdata\n");
- return -EFAULT;
- }
- dev = vdev_to_camera(vdev);
- if (dev == NULL) {
- STK_ERROR("v4l_release called on removed device\n");
- return -ENODEV;
- }
+ struct stk_camera *dev = fp->private_data;
if (dev->owner != fp) {
usb_autopm_put_interface(dev->interface);
@@ -734,14 +717,8 @@ static ssize_t v4l_stk_read(struct file *fp, char
__user *buf,
int i;
int ret;
unsigned long flags;
- struct stk_camera *dev;
- struct video_device *vdev;
struct stk_sio_buffer *sbuf;
-
- vdev = video_devdata(fp);
- if (vdev == NULL)
- return -EFAULT;
- dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = fp->private_data;
if (dev == NULL)
return -EIO;
@@ -800,15 +777,8 @@ static ssize_t v4l_stk_read(struct file *fp, char
__user *buf,
static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
{
- struct stk_camera *dev;
- struct video_device *vdev;
-
- vdev = video_devdata(fp);
-
- if (vdev == NULL)
- return -EFAULT;
+ struct stk_camera *dev = fp->private_data;
- dev = vdev_to_camera(vdev);
if (dev == NULL)
return -ENODEV;
@@ -846,16 +816,12 @@ static int v4l_stk_mmap(struct file *fp, struct
vm_area_struct *vma)
unsigned int i;
int ret;
unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
- struct stk_camera *dev;
- struct video_device *vdev;
+ struct stk_camera *dev = fp->private_data;
struct stk_sio_buffer *sbuf = NULL;
if (!(vma->vm_flags & VM_WRITE) || !(vma->vm_flags & VM_SHARED))
return -EINVAL;
- vdev = video_devdata(fp);
- dev = vdev_to_camera(vdev);
-
for (i = 0; i < dev->n_sbufs; i++) {
if (dev->sio_bufs[i].v4lbuf.m.offset == offset) {
sbuf = dev->sio_bufs + i;
@@ -1327,10 +1293,6 @@ static struct file_operations v4l_stk_fops = {
.llseek = no_llseek
};
-static void stk_v4l_dev_release(struct video_device *vd)
-{
-}
-
static struct video_device stk_v4l_data = {
.name = "stkwebcam",
.type = VFL_TYPE_GRABBER,
@@ -1339,7 +1301,7 @@ static struct video_device stk_v4l_data = {
.tvnorms = V4L2_STD_UNKNOWN,
.current_norm = V4L2_STD_UNKNOWN,
.fops = &v4l_stk_fops,
- .release = stk_v4l_dev_release,
+ .release = video_device_release,
.vidioc_querycap = stk_vidioc_querycap,
.vidioc_enum_fmt_cap = stk_vidioc_enum_fmt_cap,
@@ -1367,16 +1329,16 @@ static int stk_register_video_device(struct
stk_camera *dev)
{
int err;
- dev->vdev = stk_v4l_data;
- dev->vdev.debug = debug;
- dev->vdev.dev = &dev->interface->dev;
- dev->vdev.priv = dev;
- err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
+ *dev->vdev = stk_v4l_data;
+ dev->vdev->debug = debug;
+ dev->vdev->dev = &dev->interface->dev;
+ dev_set_drvdata(dev->vdev->dev, dev);
+ err = video_register_device(dev->vdev, VFL_TYPE_GRABBER, -1);
if (err)
STK_ERROR("v4l registration failed\n");
else
STK_INFO("Syntek USB2.0 Camera is now controlling video device"
- " /dev/video%d\n", dev->vdev.minor);
+ " /dev/video%d\n", dev->vdev->minor);
return err;
}
@@ -1387,7 +1349,7 @@ static int stk_camera_probe(struct usb_interface
*interface,
const struct usb_device_id *id)
{
int i;
- int err;
+ int err = 0;
struct stk_camera *dev = NULL;
struct usb_device *udev = interface_to_usbdev(interface);
@@ -1433,8 +1395,8 @@ static int stk_camera_probe(struct usb_interface
*interface,
}
if (!dev->isoc_ep) {
STK_ERROR("Could not find isoc-in endpoint");
- kref_put(&dev->kref, stk_camera_cleanup);
- return -ENODEV;
+ err = -ENODEV;
+ goto error;
}
dev->vsettings.brightness = 0x7fff;
dev->vsettings.palette = V4L2_PIX_FMT_RGB565;
@@ -1446,16 +1408,24 @@ static int stk_camera_probe(struct
usb_interface *interface,
usb_set_intfdata(interface, dev);
- err = stk_register_video_device(dev);
- if (err) {
- kref_put(&dev->kref, stk_camera_cleanup);
- return err;
+ if((dev->vdev = video_device_alloc()) == NULL) {
+ err = -ENOMEM;
+ goto error;
}
- stk_create_sysfs_files(&dev->vdev);
+ if((err = stk_register_video_device(dev)))
+ goto error_vdev;
+
+ stk_create_sysfs_files(dev->vdev);
usb_autopm_enable(dev->interface);
return 0;
+
+error_vdev:
+ video_device_release(dev->vdev);
+error:
+ kref_put(&dev->kref, stk_camera_cleanup);
+ return err;
}
static void stk_camera_disconnect(struct usb_interface *interface)
@@ -1466,7 +1436,12 @@ static void stk_camera_disconnect(struct
usb_interface *interface)
unset_present(dev);
wake_up_interruptible(&dev->wait_frame);
- stk_remove_sysfs_files(&dev->vdev);
+ stk_remove_sysfs_files(dev->vdev);
+
+ STK_INFO("Syntek USB2.0 Camera release resources"
+ " video device /dev/video%d\n", dev->vdev->minor);
+
+ video_unregister_device(dev->vdev);
kref_put(&dev->kref, stk_camera_cleanup);
}
diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
index df4dfef..84257fe 100644
--- a/drivers/media/video/stk-webcam.h
+++ b/drivers/media/video/stk-webcam.h
@@ -91,7 +91,7 @@ struct regval {
};
struct stk_camera {
- struct video_device vdev;
+ struct video_device *vdev;
struct usb_device *udev;
struct usb_interface *interface;
int webcam_model;
@@ -122,7 +122,6 @@ struct stk_camera {
};
#define to_stk_camera(d) container_of(d, struct stk_camera, kref)
-#define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
void stk_camera_delete(struct kref *);
int stk_camera_write_reg(struct stk_camera *, u16, u8);
--
1.5.5.1
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RFT v2] stk-webcam: Fix video_device handling
2008-06-29 1:40 [RFT v2] stk-webcam: Fix video_device handling David Ellingsworth
@ 2008-06-29 22:34 ` David Ellingsworth
2008-07-01 17:13 ` Jaime Velasco Juan
0 siblings, 1 reply; 6+ messages in thread
From: David Ellingsworth @ 2008-06-29 22:34 UTC (permalink / raw)
To: video4linux-list, Jaime Velasco Juan
[-- Attachment #1: Type: text/plain, Size: 117 bytes --]
[RFC v2.1] This patch should cleanly apply to the v4l-dvb devel branch
Patch attached.
Regards,
David Ellingsworth
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-stk-camera-fix-video_device-handling.patch --]
[-- Type: text/x-diff; name=0002-stk-camera-fix-video_device-handling.patch, Size: 9135 bytes --]
From 210a4ca1f3d59ec3d152bf9177fda750f090fcf8 Mon Sep 17 00:00:00 2001
From: David Ellingsworth <david@identd.dyndns.org>
Date: Sun, 29 Jun 2008 14:37:55 -0400
Subject: [PATCH] stk-camera: fix video_device handling
Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
---
drivers/media/video/stk-webcam.c | 106 +++++++++++++++-----------------------
drivers/media/video/stk-webcam.h | 3 +-
2 files changed, 43 insertions(+), 66 deletions(-)
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index f308c38..378059f 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -68,11 +68,6 @@ static void stk_camera_cleanup(struct kref *kref)
{
struct stk_camera *dev = to_stk_camera(kref);
- STK_INFO("Syntek USB2.0 Camera release resources"
- " video device /dev/video%d\n", dev->vdev.minor);
- video_unregister_device(&dev->vdev);
- dev->vdev.priv = NULL;
-
if (dev->sio_bufs != NULL || dev->isobufs != NULL)
STK_ERROR("We are leaking memory\n");
usb_put_intf(dev->interface);
@@ -255,7 +250,7 @@ static ssize_t show_brightness(struct device *class,
struct device_attribute *attr, char *buf)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
return sprintf(buf, "%X\n", dev->vsettings.brightness);
}
@@ -268,7 +263,7 @@ static ssize_t store_brightness(struct device *class,
int ret;
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
value = simple_strtoul(buf, &endp, 16);
@@ -285,7 +280,7 @@ static ssize_t show_hflip(struct device *class,
struct device_attribute *attr, char *buf)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
return sprintf(buf, "%d\n", dev->vsettings.hflip);
}
@@ -294,7 +289,7 @@ static ssize_t store_hflip(struct device *class,
struct device_attribute *attr, const char *buf, size_t count)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
if (strncmp(buf, "1", 1) == 0)
dev->vsettings.hflip = 1;
@@ -310,7 +305,7 @@ static ssize_t show_vflip(struct device *class,
struct device_attribute *attr, char *buf)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
return sprintf(buf, "%d\n", dev->vsettings.vflip);
}
@@ -319,7 +314,7 @@ static ssize_t store_vflip(struct device *class,
struct device_attribute *attr, const char *buf, size_t count)
{
struct video_device *vdev = to_video_device(class);
- struct stk_camera *dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = dev_get_drvdata(vdev->dev);
if (strncmp(buf, "1", 1) == 0)
dev->vsettings.vflip = 1;
@@ -683,11 +678,11 @@ static int v4l_stk_open(struct inode *inode, struct file *fp)
struct video_device *vdev;
vdev = video_devdata(fp);
- dev = vdev_to_camera(vdev);
+ dev = dev_get_drvdata(vdev->dev);
if (dev == NULL || !is_present(dev))
return -ENXIO;
- fp->private_data = vdev;
+ fp->private_data = dev;
kref_get(&dev->kref);
usb_autopm_get_interface(dev->interface);
@@ -696,19 +691,7 @@ static int v4l_stk_open(struct inode *inode, struct file *fp)
static int v4l_stk_release(struct inode *inode, struct file *fp)
{
- struct stk_camera *dev;
- struct video_device *vdev;
-
- vdev = video_devdata(fp);
- if (vdev == NULL) {
- STK_ERROR("v4l_release called w/o video devdata\n");
- return -EFAULT;
- }
- dev = vdev_to_camera(vdev);
- if (dev == NULL) {
- STK_ERROR("v4l_release called on removed device\n");
- return -ENODEV;
- }
+ struct stk_camera *dev = fp->private_data;
if (dev->owner != fp) {
usb_autopm_put_interface(dev->interface);
@@ -734,14 +717,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
int i;
int ret;
unsigned long flags;
- struct stk_camera *dev;
- struct video_device *vdev;
struct stk_sio_buffer *sbuf;
-
- vdev = video_devdata(fp);
- if (vdev == NULL)
- return -EFAULT;
- dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = fp->private_data;
if (dev == NULL)
return -EIO;
@@ -800,15 +777,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
{
- struct stk_camera *dev;
- struct video_device *vdev;
-
- vdev = video_devdata(fp);
-
- if (vdev == NULL)
- return -EFAULT;
+ struct stk_camera *dev = fp->private_data;
- dev = vdev_to_camera(vdev);
if (dev == NULL)
return -ENODEV;
@@ -846,16 +816,12 @@ static int v4l_stk_mmap(struct file *fp, struct vm_area_struct *vma)
unsigned int i;
int ret;
unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
- struct stk_camera *dev;
- struct video_device *vdev;
+ struct stk_camera *dev = fp->private_data;
struct stk_sio_buffer *sbuf = NULL;
if (!(vma->vm_flags & VM_WRITE) || !(vma->vm_flags & VM_SHARED))
return -EINVAL;
- vdev = video_devdata(fp);
- dev = vdev_to_camera(vdev);
-
for (i = 0; i < dev->n_sbufs; i++) {
if (dev->sio_bufs[i].v4lbuf.m.offset == offset) {
sbuf = dev->sio_bufs + i;
@@ -1327,10 +1293,6 @@ static struct file_operations v4l_stk_fops = {
.llseek = no_llseek
};
-static void stk_v4l_dev_release(struct video_device *vd)
-{
-}
-
static struct video_device stk_v4l_data = {
.name = "stkwebcam",
.type = VFL_TYPE_GRABBER,
@@ -1339,7 +1301,7 @@ static struct video_device stk_v4l_data = {
.tvnorms = V4L2_STD_UNKNOWN,
.current_norm = V4L2_STD_UNKNOWN,
.fops = &v4l_stk_fops,
- .release = stk_v4l_dev_release,
+ .release = video_device_release,
.vidioc_querycap = stk_vidioc_querycap,
.vidioc_enum_fmt_vid_cap = stk_vidioc_enum_fmt_vid_cap,
@@ -1367,16 +1329,16 @@ static int stk_register_video_device(struct stk_camera *dev)
{
int err;
- dev->vdev = stk_v4l_data;
- dev->vdev.debug = debug;
- dev->vdev.dev = &dev->interface->dev;
- dev->vdev.priv = dev;
- err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
+ *dev->vdev = stk_v4l_data;
+ dev->vdev->debug = debug;
+ dev->vdev->dev = &dev->interface->dev;
+ dev_set_drvdata(dev->vdev->dev, dev);
+ err = video_register_device(dev->vdev, VFL_TYPE_GRABBER, -1);
if (err)
STK_ERROR("v4l registration failed\n");
else
STK_INFO("Syntek USB2.0 Camera is now controlling video device"
- " /dev/video%d\n", dev->vdev.minor);
+ " /dev/video%d\n", dev->vdev->minor);
return err;
}
@@ -1387,7 +1349,7 @@ static int stk_camera_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{
int i;
- int err;
+ int err = 0;
struct stk_camera *dev = NULL;
struct usb_device *udev = interface_to_usbdev(interface);
@@ -1433,8 +1395,8 @@ static int stk_camera_probe(struct usb_interface *interface,
}
if (!dev->isoc_ep) {
STK_ERROR("Could not find isoc-in endpoint");
- kref_put(&dev->kref, stk_camera_cleanup);
- return -ENODEV;
+ err = -ENODEV;
+ goto error;
}
dev->vsettings.brightness = 0x7fff;
dev->vsettings.palette = V4L2_PIX_FMT_RGB565;
@@ -1446,16 +1408,27 @@ static int stk_camera_probe(struct usb_interface *interface,
usb_set_intfdata(interface, dev);
+ dev->vdev = video_device_alloc();
+ if (dev->vdev == NULL) {
+ err = -ENOMEM;
+ goto error;
+ }
+
err = stk_register_video_device(dev);
if (err) {
- kref_put(&dev->kref, stk_camera_cleanup);
- return err;
+ goto error_vdev;
}
- stk_create_sysfs_files(&dev->vdev);
+ stk_create_sysfs_files(dev->vdev);
usb_autopm_enable(dev->interface);
return 0;
+
+error_vdev:
+ video_device_release(dev->vdev);
+error:
+ kref_put(&dev->kref, stk_camera_cleanup);
+ return err;
}
static void stk_camera_disconnect(struct usb_interface *interface)
@@ -1466,7 +1439,12 @@ static void stk_camera_disconnect(struct usb_interface *interface)
unset_present(dev);
wake_up_interruptible(&dev->wait_frame);
- stk_remove_sysfs_files(&dev->vdev);
+ stk_remove_sysfs_files(dev->vdev);
+
+ STK_INFO("Syntek USB2.0 Camera release resources"
+ " video device /dev/video%d\n", dev->vdev->minor);
+
+ video_unregister_device(dev->vdev);
kref_put(&dev->kref, stk_camera_cleanup);
}
diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
index df4dfef..84257fe 100644
--- a/drivers/media/video/stk-webcam.h
+++ b/drivers/media/video/stk-webcam.h
@@ -91,7 +91,7 @@ struct regval {
};
struct stk_camera {
- struct video_device vdev;
+ struct video_device *vdev;
struct usb_device *udev;
struct usb_interface *interface;
int webcam_model;
@@ -122,7 +122,6 @@ struct stk_camera {
};
#define to_stk_camera(d) container_of(d, struct stk_camera, kref)
-#define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
void stk_camera_delete(struct kref *);
int stk_camera_write_reg(struct stk_camera *, u16, u8);
--
1.5.5.1
[-- Attachment #3: Type: text/plain, Size: 164 bytes --]
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RFT v2] stk-webcam: Fix video_device handling
2008-06-29 22:34 ` David Ellingsworth
@ 2008-07-01 17:13 ` Jaime Velasco Juan
2008-07-01 19:42 ` David Ellingsworth
0 siblings, 1 reply; 6+ messages in thread
From: Jaime Velasco Juan @ 2008-07-01 17:13 UTC (permalink / raw)
To: David Ellingsworth; +Cc: video4linux-list
Hi David,
it seems to work ok now with your other patch, but if the video_device
struct is going to be ref. counted, wouldn't it make sense to drop the
kref in the driver and free all resources in the release callback? With
these changes there are two krefs which are created, get and put at the
same time and for the same purpose.
I also like better the video_device struct embedded in the main
stk_camera struct (as it is now), but if people prefer having it
referenced with a pointer, so be it.
Regards,
Jaime
El dom. 29 de jun. de 2008, a las 18:34:27 -0400, David Ellingsworth escribió:
> [RFC v2.1] This patch should cleanly apply to the v4l-dvb devel branch
> Patch attached.
>
> Regards,
>
> David Ellingsworth
> From 210a4ca1f3d59ec3d152bf9177fda750f090fcf8 Mon Sep 17 00:00:00 2001
> From: David Ellingsworth <david@identd.dyndns.org>
> Date: Sun, 29 Jun 2008 14:37:55 -0400
> Subject: [PATCH] stk-camera: fix video_device handling
>
>
> Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
> ---
> drivers/media/video/stk-webcam.c | 106 +++++++++++++++-----------------------
> drivers/media/video/stk-webcam.h | 3 +-
> 2 files changed, 43 insertions(+), 66 deletions(-)
>
> diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
> index f308c38..378059f 100644
> --- a/drivers/media/video/stk-webcam.c
> +++ b/drivers/media/video/stk-webcam.c
> @@ -68,11 +68,6 @@ static void stk_camera_cleanup(struct kref *kref)
> {
> struct stk_camera *dev = to_stk_camera(kref);
>
> - STK_INFO("Syntek USB2.0 Camera release resources"
> - " video device /dev/video%d\n", dev->vdev.minor);
> - video_unregister_device(&dev->vdev);
> - dev->vdev.priv = NULL;
> -
> if (dev->sio_bufs != NULL || dev->isobufs != NULL)
> STK_ERROR("We are leaking memory\n");
> usb_put_intf(dev->interface);
> @@ -255,7 +250,7 @@ static ssize_t show_brightness(struct device *class,
> struct device_attribute *attr, char *buf)
> {
> struct video_device *vdev = to_video_device(class);
> - struct stk_camera *dev = vdev_to_camera(vdev);
> + struct stk_camera *dev = dev_get_drvdata(vdev->dev);
>
> return sprintf(buf, "%X\n", dev->vsettings.brightness);
> }
> @@ -268,7 +263,7 @@ static ssize_t store_brightness(struct device *class,
> int ret;
>
> struct video_device *vdev = to_video_device(class);
> - struct stk_camera *dev = vdev_to_camera(vdev);
> + struct stk_camera *dev = dev_get_drvdata(vdev->dev);
>
> value = simple_strtoul(buf, &endp, 16);
>
> @@ -285,7 +280,7 @@ static ssize_t show_hflip(struct device *class,
> struct device_attribute *attr, char *buf)
> {
> struct video_device *vdev = to_video_device(class);
> - struct stk_camera *dev = vdev_to_camera(vdev);
> + struct stk_camera *dev = dev_get_drvdata(vdev->dev);
>
> return sprintf(buf, "%d\n", dev->vsettings.hflip);
> }
> @@ -294,7 +289,7 @@ static ssize_t store_hflip(struct device *class,
> struct device_attribute *attr, const char *buf, size_t count)
> {
> struct video_device *vdev = to_video_device(class);
> - struct stk_camera *dev = vdev_to_camera(vdev);
> + struct stk_camera *dev = dev_get_drvdata(vdev->dev);
>
> if (strncmp(buf, "1", 1) == 0)
> dev->vsettings.hflip = 1;
> @@ -310,7 +305,7 @@ static ssize_t show_vflip(struct device *class,
> struct device_attribute *attr, char *buf)
> {
> struct video_device *vdev = to_video_device(class);
> - struct stk_camera *dev = vdev_to_camera(vdev);
> + struct stk_camera *dev = dev_get_drvdata(vdev->dev);
>
> return sprintf(buf, "%d\n", dev->vsettings.vflip);
> }
> @@ -319,7 +314,7 @@ static ssize_t store_vflip(struct device *class,
> struct device_attribute *attr, const char *buf, size_t count)
> {
> struct video_device *vdev = to_video_device(class);
> - struct stk_camera *dev = vdev_to_camera(vdev);
> + struct stk_camera *dev = dev_get_drvdata(vdev->dev);
>
> if (strncmp(buf, "1", 1) == 0)
> dev->vsettings.vflip = 1;
> @@ -683,11 +678,11 @@ static int v4l_stk_open(struct inode *inode, struct file *fp)
> struct video_device *vdev;
>
> vdev = video_devdata(fp);
> - dev = vdev_to_camera(vdev);
> + dev = dev_get_drvdata(vdev->dev);
>
> if (dev == NULL || !is_present(dev))
> return -ENXIO;
> - fp->private_data = vdev;
> + fp->private_data = dev;
> kref_get(&dev->kref);
> usb_autopm_get_interface(dev->interface);
>
> @@ -696,19 +691,7 @@ static int v4l_stk_open(struct inode *inode, struct file *fp)
>
> static int v4l_stk_release(struct inode *inode, struct file *fp)
> {
> - struct stk_camera *dev;
> - struct video_device *vdev;
> -
> - vdev = video_devdata(fp);
> - if (vdev == NULL) {
> - STK_ERROR("v4l_release called w/o video devdata\n");
> - return -EFAULT;
> - }
> - dev = vdev_to_camera(vdev);
> - if (dev == NULL) {
> - STK_ERROR("v4l_release called on removed device\n");
> - return -ENODEV;
> - }
> + struct stk_camera *dev = fp->private_data;
>
> if (dev->owner != fp) {
> usb_autopm_put_interface(dev->interface);
> @@ -734,14 +717,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
> int i;
> int ret;
> unsigned long flags;
> - struct stk_camera *dev;
> - struct video_device *vdev;
> struct stk_sio_buffer *sbuf;
> -
> - vdev = video_devdata(fp);
> - if (vdev == NULL)
> - return -EFAULT;
> - dev = vdev_to_camera(vdev);
> + struct stk_camera *dev = fp->private_data;
>
> if (dev == NULL)
> return -EIO;
> @@ -800,15 +777,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
>
> static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
> {
> - struct stk_camera *dev;
> - struct video_device *vdev;
> -
> - vdev = video_devdata(fp);
> -
> - if (vdev == NULL)
> - return -EFAULT;
> + struct stk_camera *dev = fp->private_data;
>
> - dev = vdev_to_camera(vdev);
> if (dev == NULL)
> return -ENODEV;
>
> @@ -846,16 +816,12 @@ static int v4l_stk_mmap(struct file *fp, struct vm_area_struct *vma)
> unsigned int i;
> int ret;
> unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
> - struct stk_camera *dev;
> - struct video_device *vdev;
> + struct stk_camera *dev = fp->private_data;
> struct stk_sio_buffer *sbuf = NULL;
>
> if (!(vma->vm_flags & VM_WRITE) || !(vma->vm_flags & VM_SHARED))
> return -EINVAL;
>
> - vdev = video_devdata(fp);
> - dev = vdev_to_camera(vdev);
> -
> for (i = 0; i < dev->n_sbufs; i++) {
> if (dev->sio_bufs[i].v4lbuf.m.offset == offset) {
> sbuf = dev->sio_bufs + i;
> @@ -1327,10 +1293,6 @@ static struct file_operations v4l_stk_fops = {
> .llseek = no_llseek
> };
>
> -static void stk_v4l_dev_release(struct video_device *vd)
> -{
> -}
> -
> static struct video_device stk_v4l_data = {
> .name = "stkwebcam",
> .type = VFL_TYPE_GRABBER,
> @@ -1339,7 +1301,7 @@ static struct video_device stk_v4l_data = {
> .tvnorms = V4L2_STD_UNKNOWN,
> .current_norm = V4L2_STD_UNKNOWN,
> .fops = &v4l_stk_fops,
> - .release = stk_v4l_dev_release,
> + .release = video_device_release,
>
> .vidioc_querycap = stk_vidioc_querycap,
> .vidioc_enum_fmt_vid_cap = stk_vidioc_enum_fmt_vid_cap,
> @@ -1367,16 +1329,16 @@ static int stk_register_video_device(struct stk_camera *dev)
> {
> int err;
>
> - dev->vdev = stk_v4l_data;
> - dev->vdev.debug = debug;
> - dev->vdev.dev = &dev->interface->dev;
> - dev->vdev.priv = dev;
> - err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
> + *dev->vdev = stk_v4l_data;
> + dev->vdev->debug = debug;
> + dev->vdev->dev = &dev->interface->dev;
> + dev_set_drvdata(dev->vdev->dev, dev);
> + err = video_register_device(dev->vdev, VFL_TYPE_GRABBER, -1);
> if (err)
> STK_ERROR("v4l registration failed\n");
> else
> STK_INFO("Syntek USB2.0 Camera is now controlling video device"
> - " /dev/video%d\n", dev->vdev.minor);
> + " /dev/video%d\n", dev->vdev->minor);
> return err;
> }
>
> @@ -1387,7 +1349,7 @@ static int stk_camera_probe(struct usb_interface *interface,
> const struct usb_device_id *id)
> {
> int i;
> - int err;
> + int err = 0;
>
> struct stk_camera *dev = NULL;
> struct usb_device *udev = interface_to_usbdev(interface);
> @@ -1433,8 +1395,8 @@ static int stk_camera_probe(struct usb_interface *interface,
> }
> if (!dev->isoc_ep) {
> STK_ERROR("Could not find isoc-in endpoint");
> - kref_put(&dev->kref, stk_camera_cleanup);
> - return -ENODEV;
> + err = -ENODEV;
> + goto error;
> }
> dev->vsettings.brightness = 0x7fff;
> dev->vsettings.palette = V4L2_PIX_FMT_RGB565;
> @@ -1446,16 +1408,27 @@ static int stk_camera_probe(struct usb_interface *interface,
>
> usb_set_intfdata(interface, dev);
>
> + dev->vdev = video_device_alloc();
> + if (dev->vdev == NULL) {
> + err = -ENOMEM;
> + goto error;
> + }
> +
> err = stk_register_video_device(dev);
> if (err) {
> - kref_put(&dev->kref, stk_camera_cleanup);
> - return err;
> + goto error_vdev;
> }
>
> - stk_create_sysfs_files(&dev->vdev);
> + stk_create_sysfs_files(dev->vdev);
> usb_autopm_enable(dev->interface);
>
> return 0;
> +
> +error_vdev:
> + video_device_release(dev->vdev);
> +error:
> + kref_put(&dev->kref, stk_camera_cleanup);
> + return err;
> }
>
> static void stk_camera_disconnect(struct usb_interface *interface)
> @@ -1466,7 +1439,12 @@ static void stk_camera_disconnect(struct usb_interface *interface)
> unset_present(dev);
>
> wake_up_interruptible(&dev->wait_frame);
> - stk_remove_sysfs_files(&dev->vdev);
> + stk_remove_sysfs_files(dev->vdev);
> +
> + STK_INFO("Syntek USB2.0 Camera release resources"
> + " video device /dev/video%d\n", dev->vdev->minor);
> +
> + video_unregister_device(dev->vdev);
>
> kref_put(&dev->kref, stk_camera_cleanup);
> }
> diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
> index df4dfef..84257fe 100644
> --- a/drivers/media/video/stk-webcam.h
> +++ b/drivers/media/video/stk-webcam.h
> @@ -91,7 +91,7 @@ struct regval {
> };
>
> struct stk_camera {
> - struct video_device vdev;
> + struct video_device *vdev;
> struct usb_device *udev;
> struct usb_interface *interface;
> int webcam_model;
> @@ -122,7 +122,6 @@ struct stk_camera {
> };
>
> #define to_stk_camera(d) container_of(d, struct stk_camera, kref)
> -#define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
>
> void stk_camera_delete(struct kref *);
> int stk_camera_write_reg(struct stk_camera *, u16, u8);
> --
> 1.5.5.1
>
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFT v2] stk-webcam: Fix video_device handling
2008-07-01 17:13 ` Jaime Velasco Juan
@ 2008-07-01 19:42 ` David Ellingsworth
2008-07-02 4:01 ` David Ellingsworth
0 siblings, 1 reply; 6+ messages in thread
From: David Ellingsworth @ 2008-07-01 19:42 UTC (permalink / raw)
To: Jaime Velasco Juan; +Cc: video4linux-list
On Tue, Jul 1, 2008 at 1:13 PM, Jaime Velasco Juan
<jsagarribay@gmail.com> wrote:
> Hi David,
>
> it seems to work ok now with your other patch, but if the video_device
> struct is going to be ref. counted, wouldn't it make sense to drop the
> kref in the driver and free all resources in the release callback? With
> these changes there are two krefs which are created, get and put at the
> same time and for the same purpose.
>
I noticed this as well and was actually working on a patch which would
have removed the kref from the stk_camera since it would no longer
have been needed.
> I also like better the video_device struct embedded in the main
> stk_camera struct (as it is now), but if people prefer having it
> referenced with a pointer, so be it.
>
Agreed. The next patch I submit will keep the video_device struct in
the stk_camera struct as it really doesn't need to be allocated using
video_device_alloc().
> Regards,
>
> Jaime
I'm currently working to correct the kobject reference count in
videodev which was previously patched by using a kref. The resulting
behavior should be the same, but the code will be much simpler to
understand. Once I have this working I will submit a proper patch for
stk-webcam as well.
Regards,
David Ellingsworth
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFT v2] stk-webcam: Fix video_device handling
2008-07-01 19:42 ` David Ellingsworth
@ 2008-07-02 4:01 ` David Ellingsworth
2008-07-03 18:53 ` Jaime Velasco Juan
0 siblings, 1 reply; 6+ messages in thread
From: David Ellingsworth @ 2008-07-02 4:01 UTC (permalink / raw)
To: Jaime Velasco Juan; +Cc: video4linux-list
On Tue, Jul 1, 2008 at 3:42 PM, David Ellingsworth
<david@identd.dyndns.org> wrote:
> On Tue, Jul 1, 2008 at 1:13 PM, Jaime Velasco Juan
> <jsagarribay@gmail.com> wrote:
>> Hi David,
>>
>> it seems to work ok now with your other patch, but if the video_device
>> struct is going to be ref. counted, wouldn't it make sense to drop the
>> kref in the driver and free all resources in the release callback? With
>> these changes there are two krefs which are created, get and put at the
>> same time and for the same purpose.
>>
> I noticed this as well and was actually working on a patch which would
> have removed the kref from the stk_camera since it would no longer
> have been needed.
>
>> I also like better the video_device struct embedded in the main
>> stk_camera struct (as it is now), but if people prefer having it
>> referenced with a pointer, so be it.
>>
> Agreed. The next patch I submit will keep the video_device struct in
> the stk_camera struct as it really doesn't need to be allocated using
> video_device_alloc().
>
>> Regards,
>>
>> Jaime
>
> I'm currently working to correct the kobject reference count in
> videodev which was previously patched by using a kref. The resulting
> behavior should be the same, but the code will be much simpler to
> understand. Once I have this working I will submit a proper patch for
> stk-webcam as well.
>
> Regards,
>
> David Ellingsworth
>
As promised, here's the patch which frees the stk_camera object via
the kobject release callback. This patch should be applied along with
the latest videodev patch titled "videodev: fix kobj ref count". This
patch removes the unnecessary kref object from stk_camera and reduces
the size of the driver by 40 lines of code.
Regards,
David Ellingsworth
[PATCH] stk-webcam: release via kobj
Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
---
drivers/media/video/stk-webcam.c | 84 ++++++++++---------------------------
drivers/media/video/stk-webcam.h | 2 -
2 files changed, 23 insertions(+), 63 deletions(-)
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index f308c38..acf9a69 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -64,22 +64,6 @@ static struct usb_device_id stkwebcam_table[] = {
};
MODULE_DEVICE_TABLE(usb, stkwebcam_table);
-static void stk_camera_cleanup(struct kref *kref)
-{
- struct stk_camera *dev = to_stk_camera(kref);
-
- STK_INFO("Syntek USB2.0 Camera release resources"
- " video device /dev/video%d\n", dev->vdev.minor);
- video_unregister_device(&dev->vdev);
- dev->vdev.priv = NULL;
-
- if (dev->sio_bufs != NULL || dev->isobufs != NULL)
- STK_ERROR("We are leaking memory\n");
- usb_put_intf(dev->interface);
- kfree(dev);
-}
-
-
/*
* Basic stuff
*/
@@ -687,8 +671,7 @@ static int v4l_stk_open(struct inode *inode,
struct file *fp)
if (dev == NULL || !is_present(dev))
return -ENXIO;
- fp->private_data = vdev;
- kref_get(&dev->kref);
+ fp->private_data = dev;
usb_autopm_get_interface(dev->interface);
return 0;
@@ -696,23 +679,10 @@ static int v4l_stk_open(struct inode *inode,
struct file *fp)
static int v4l_stk_release(struct inode *inode, struct file *fp)
{
- struct stk_camera *dev;
- struct video_device *vdev;
-
- vdev = video_devdata(fp);
- if (vdev == NULL) {
- STK_ERROR("v4l_release called w/o video devdata\n");
- return -EFAULT;
- }
- dev = vdev_to_camera(vdev);
- if (dev == NULL) {
- STK_ERROR("v4l_release called on removed device\n");
- return -ENODEV;
- }
+ struct stk_camera *dev = fp->private_data;
if (dev->owner != fp) {
usb_autopm_put_interface(dev->interface);
- kref_put(&dev->kref, stk_camera_cleanup);
return 0;
}
@@ -723,7 +693,6 @@ static int v4l_stk_release(struct inode *inode,
struct file *fp)
dev->owner = NULL;
usb_autopm_put_interface(dev->interface);
- kref_put(&dev->kref, stk_camera_cleanup);
return 0;
}
@@ -734,14 +703,8 @@ static ssize_t v4l_stk_read(struct file *fp, char
__user *buf,
int i;
int ret;
unsigned long flags;
- struct stk_camera *dev;
- struct video_device *vdev;
struct stk_sio_buffer *sbuf;
-
- vdev = video_devdata(fp);
- if (vdev == NULL)
- return -EFAULT;
- dev = vdev_to_camera(vdev);
+ struct stk_camera *dev = fp->private_data;
if (dev == NULL)
return -EIO;
@@ -800,15 +763,8 @@ static ssize_t v4l_stk_read(struct file *fp, char
__user *buf,
static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
{
- struct stk_camera *dev;
- struct video_device *vdev;
-
- vdev = video_devdata(fp);
-
- if (vdev == NULL)
- return -EFAULT;
+ struct stk_camera *dev = fp->private_data;
- dev = vdev_to_camera(vdev);
if (dev == NULL)
return -ENODEV;
@@ -846,16 +802,12 @@ static int v4l_stk_mmap(struct file *fp, struct
vm_area_struct *vma)
unsigned int i;
int ret;
unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
- struct stk_camera *dev;
- struct video_device *vdev;
+ struct stk_camera *dev = fp->private_data;
struct stk_sio_buffer *sbuf = NULL;
if (!(vma->vm_flags & VM_WRITE) || !(vma->vm_flags & VM_SHARED))
return -EINVAL;
- vdev = video_devdata(fp);
- dev = vdev_to_camera(vdev);
-
for (i = 0; i < dev->n_sbufs; i++) {
if (dev->sio_bufs[i].v4lbuf.m.offset == offset) {
sbuf = dev->sio_bufs + i;
@@ -1329,6 +1281,12 @@ static struct file_operations v4l_stk_fops = {
static void stk_v4l_dev_release(struct video_device *vd)
{
+ struct stk_camera *dev = vdev_to_camera(vd);
+
+ if (dev->sio_bufs != NULL || dev->isobufs != NULL)
+ STK_ERROR("We are leaking memory\n");
+ usb_put_intf(dev->interface);
+ kfree(dev);
}
static struct video_device stk_v4l_data = {
@@ -1370,7 +1328,6 @@ static int stk_register_video_device(struct
stk_camera *dev)
dev->vdev = stk_v4l_data;
dev->vdev.debug = debug;
dev->vdev.dev = &dev->interface->dev;
- dev->vdev.priv = dev;
err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
if (err)
STK_ERROR("v4l registration failed\n");
@@ -1387,7 +1344,7 @@ static int stk_camera_probe(struct usb_interface
*interface,
const struct usb_device_id *id)
{
int i;
- int err;
+ int err = 0;
struct stk_camera *dev = NULL;
struct usb_device *udev = interface_to_usbdev(interface);
@@ -1400,7 +1357,6 @@ static int stk_camera_probe(struct usb_interface
*interface,
return -ENOMEM;
}
- kref_init(&dev->kref);
spin_lock_init(&dev->spinlock);
init_waitqueue_head(&dev->wait_frame);
@@ -1433,8 +1389,8 @@ static int stk_camera_probe(struct usb_interface
*interface,
}
if (!dev->isoc_ep) {
STK_ERROR("Could not find isoc-in endpoint");
- kref_put(&dev->kref, stk_camera_cleanup);
- return -ENODEV;
+ err = -ENODEV;
+ goto error;
}
dev->vsettings.brightness = 0x7fff;
dev->vsettings.palette = V4L2_PIX_FMT_RGB565;
@@ -1448,14 +1404,17 @@ static int stk_camera_probe(struct
usb_interface *interface,
err = stk_register_video_device(dev);
if (err) {
- kref_put(&dev->kref, stk_camera_cleanup);
- return err;
+ goto error;
}
stk_create_sysfs_files(&dev->vdev);
usb_autopm_enable(dev->interface);
return 0;
+
+error:
+ kfree(dev);
+ return err;
}
static void stk_camera_disconnect(struct usb_interface *interface)
@@ -1468,7 +1427,10 @@ static void stk_camera_disconnect(struct
usb_interface *interface)
wake_up_interruptible(&dev->wait_frame);
stk_remove_sysfs_files(&dev->vdev);
- kref_put(&dev->kref, stk_camera_cleanup);
+ STK_INFO("Syntek USB2.0 Camera release resources"
+ " video device /dev/video%d\n", dev->vdev.minor);
+
+ video_unregister_device(&dev->vdev);
}
#ifdef CONFIG_PM
diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
index df4dfef..084a85b 100644
--- a/drivers/media/video/stk-webcam.h
+++ b/drivers/media/video/stk-webcam.h
@@ -99,7 +99,6 @@ struct stk_camera {
u8 isoc_ep;
- struct kref kref;
/* Not sure if this is right */
atomic_t urbs_used;
@@ -121,7 +120,6 @@ struct stk_camera {
unsigned sequence;
};
-#define to_stk_camera(d) container_of(d, struct stk_camera, kref)
#define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
void stk_camera_delete(struct kref *);
--
1.5.5.1
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RFT v2] stk-webcam: Fix video_device handling
2008-07-02 4:01 ` David Ellingsworth
@ 2008-07-03 18:53 ` Jaime Velasco Juan
0 siblings, 0 replies; 6+ messages in thread
From: Jaime Velasco Juan @ 2008-07-03 18:53 UTC (permalink / raw)
To: David Ellingsworth; +Cc: video4linux-list
El mié. 02 de jul. de 2008, a las 00:01:20 -0400, David Ellingsworth escribió:
> On Tue, Jul 1, 2008 at 3:42 PM, David Ellingsworth
> <david@identd.dyndns.org> wrote:
> > On Tue, Jul 1, 2008 at 1:13 PM, Jaime Velasco Juan
> > <jsagarribay@gmail.com> wrote:
> >> Hi David,
> >>
> >> it seems to work ok now with your other patch, but if the video_device
> >> struct is going to be ref. counted, wouldn't it make sense to drop the
> >> kref in the driver and free all resources in the release callback? With
> >> these changes there are two krefs which are created, get and put at the
> >> same time and for the same purpose.
> >>
> > I noticed this as well and was actually working on a patch which would
> > have removed the kref from the stk_camera since it would no longer
> > have been needed.
> >
> >> I also like better the video_device struct embedded in the main
> >> stk_camera struct (as it is now), but if people prefer having it
> >> referenced with a pointer, so be it.
> >>
> > Agreed. The next patch I submit will keep the video_device struct in
> > the stk_camera struct as it really doesn't need to be allocated using
> > video_device_alloc().
> >
> >> Regards,
> >>
> >> Jaime
> >
> > I'm currently working to correct the kobject reference count in
> > videodev which was previously patched by using a kref. The resulting
> > behavior should be the same, but the code will be much simpler to
> > understand. Once I have this working I will submit a proper patch for
> > stk-webcam as well.
> >
> > Regards,
> >
> > David Ellingsworth
> >
>
> As promised, here's the patch which frees the stk_camera object via
> the kobject release callback. This patch should be applied along with
> the latest videodev patch titled "videodev: fix kobj ref count". This
> patch removes the unnecessary kref object from stk_camera and reduces
> the size of the driver by 40 lines of code.
>
> Regards,
>
> David Ellingsworth
>
> [PATCH] stk-webcam: release via kobj
>
>
> Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
Hi David, seems to work fine, I don't have any complaints.
Acked-by: Jaime Velasco Juan <jsagarribay@gmail.com>
Thanks.
> ---
> drivers/media/video/stk-webcam.c | 84 ++++++++++---------------------------
> drivers/media/video/stk-webcam.h | 2 -
> 2 files changed, 23 insertions(+), 63 deletions(-)
>
> diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
> index f308c38..acf9a69 100644
> --- a/drivers/media/video/stk-webcam.c
> +++ b/drivers/media/video/stk-webcam.c
> @@ -64,22 +64,6 @@ static struct usb_device_id stkwebcam_table[] = {
> };
> MODULE_DEVICE_TABLE(usb, stkwebcam_table);
>
> -static void stk_camera_cleanup(struct kref *kref)
> -{
> - struct stk_camera *dev = to_stk_camera(kref);
> -
> - STK_INFO("Syntek USB2.0 Camera release resources"
> - " video device /dev/video%d\n", dev->vdev.minor);
> - video_unregister_device(&dev->vdev);
> - dev->vdev.priv = NULL;
> -
> - if (dev->sio_bufs != NULL || dev->isobufs != NULL)
> - STK_ERROR("We are leaking memory\n");
> - usb_put_intf(dev->interface);
> - kfree(dev);
> -}
> -
> -
> /*
> * Basic stuff
> */
> @@ -687,8 +671,7 @@ static int v4l_stk_open(struct inode *inode,
> struct file *fp)
>
> if (dev == NULL || !is_present(dev))
> return -ENXIO;
> - fp->private_data = vdev;
> - kref_get(&dev->kref);
> + fp->private_data = dev;
> usb_autopm_get_interface(dev->interface);
>
> return 0;
> @@ -696,23 +679,10 @@ static int v4l_stk_open(struct inode *inode,
> struct file *fp)
>
> static int v4l_stk_release(struct inode *inode, struct file *fp)
> {
> - struct stk_camera *dev;
> - struct video_device *vdev;
> -
> - vdev = video_devdata(fp);
> - if (vdev == NULL) {
> - STK_ERROR("v4l_release called w/o video devdata\n");
> - return -EFAULT;
> - }
> - dev = vdev_to_camera(vdev);
> - if (dev == NULL) {
> - STK_ERROR("v4l_release called on removed device\n");
> - return -ENODEV;
> - }
> + struct stk_camera *dev = fp->private_data;
>
> if (dev->owner != fp) {
> usb_autopm_put_interface(dev->interface);
> - kref_put(&dev->kref, stk_camera_cleanup);
> return 0;
> }
>
> @@ -723,7 +693,6 @@ static int v4l_stk_release(struct inode *inode,
> struct file *fp)
> dev->owner = NULL;
>
> usb_autopm_put_interface(dev->interface);
> - kref_put(&dev->kref, stk_camera_cleanup);
>
> return 0;
> }
> @@ -734,14 +703,8 @@ static ssize_t v4l_stk_read(struct file *fp, char
> __user *buf,
> int i;
> int ret;
> unsigned long flags;
> - struct stk_camera *dev;
> - struct video_device *vdev;
> struct stk_sio_buffer *sbuf;
> -
> - vdev = video_devdata(fp);
> - if (vdev == NULL)
> - return -EFAULT;
> - dev = vdev_to_camera(vdev);
> + struct stk_camera *dev = fp->private_data;
>
> if (dev == NULL)
> return -EIO;
> @@ -800,15 +763,8 @@ static ssize_t v4l_stk_read(struct file *fp, char
> __user *buf,
>
> static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
> {
> - struct stk_camera *dev;
> - struct video_device *vdev;
> -
> - vdev = video_devdata(fp);
> -
> - if (vdev == NULL)
> - return -EFAULT;
> + struct stk_camera *dev = fp->private_data;
>
> - dev = vdev_to_camera(vdev);
> if (dev == NULL)
> return -ENODEV;
>
> @@ -846,16 +802,12 @@ static int v4l_stk_mmap(struct file *fp, struct
> vm_area_struct *vma)
> unsigned int i;
> int ret;
> unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
> - struct stk_camera *dev;
> - struct video_device *vdev;
> + struct stk_camera *dev = fp->private_data;
> struct stk_sio_buffer *sbuf = NULL;
>
> if (!(vma->vm_flags & VM_WRITE) || !(vma->vm_flags & VM_SHARED))
> return -EINVAL;
>
> - vdev = video_devdata(fp);
> - dev = vdev_to_camera(vdev);
> -
> for (i = 0; i < dev->n_sbufs; i++) {
> if (dev->sio_bufs[i].v4lbuf.m.offset == offset) {
> sbuf = dev->sio_bufs + i;
> @@ -1329,6 +1281,12 @@ static struct file_operations v4l_stk_fops = {
>
> static void stk_v4l_dev_release(struct video_device *vd)
> {
> + struct stk_camera *dev = vdev_to_camera(vd);
> +
> + if (dev->sio_bufs != NULL || dev->isobufs != NULL)
> + STK_ERROR("We are leaking memory\n");
> + usb_put_intf(dev->interface);
> + kfree(dev);
> }
>
> static struct video_device stk_v4l_data = {
> @@ -1370,7 +1328,6 @@ static int stk_register_video_device(struct
> stk_camera *dev)
> dev->vdev = stk_v4l_data;
> dev->vdev.debug = debug;
> dev->vdev.dev = &dev->interface->dev;
> - dev->vdev.priv = dev;
> err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
> if (err)
> STK_ERROR("v4l registration failed\n");
> @@ -1387,7 +1344,7 @@ static int stk_camera_probe(struct usb_interface
> *interface,
> const struct usb_device_id *id)
> {
> int i;
> - int err;
> + int err = 0;
>
> struct stk_camera *dev = NULL;
> struct usb_device *udev = interface_to_usbdev(interface);
> @@ -1400,7 +1357,6 @@ static int stk_camera_probe(struct usb_interface
> *interface,
> return -ENOMEM;
> }
>
> - kref_init(&dev->kref);
> spin_lock_init(&dev->spinlock);
> init_waitqueue_head(&dev->wait_frame);
>
> @@ -1433,8 +1389,8 @@ static int stk_camera_probe(struct usb_interface
> *interface,
> }
> if (!dev->isoc_ep) {
> STK_ERROR("Could not find isoc-in endpoint");
> - kref_put(&dev->kref, stk_camera_cleanup);
> - return -ENODEV;
> + err = -ENODEV;
> + goto error;
> }
> dev->vsettings.brightness = 0x7fff;
> dev->vsettings.palette = V4L2_PIX_FMT_RGB565;
> @@ -1448,14 +1404,17 @@ static int stk_camera_probe(struct
> usb_interface *interface,
>
> err = stk_register_video_device(dev);
> if (err) {
> - kref_put(&dev->kref, stk_camera_cleanup);
> - return err;
> + goto error;
> }
>
> stk_create_sysfs_files(&dev->vdev);
> usb_autopm_enable(dev->interface);
>
> return 0;
> +
> +error:
> + kfree(dev);
> + return err;
> }
>
> static void stk_camera_disconnect(struct usb_interface *interface)
> @@ -1468,7 +1427,10 @@ static void stk_camera_disconnect(struct
> usb_interface *interface)
> wake_up_interruptible(&dev->wait_frame);
> stk_remove_sysfs_files(&dev->vdev);
>
> - kref_put(&dev->kref, stk_camera_cleanup);
> + STK_INFO("Syntek USB2.0 Camera release resources"
> + " video device /dev/video%d\n", dev->vdev.minor);
> +
> + video_unregister_device(&dev->vdev);
> }
>
> #ifdef CONFIG_PM
> diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
> index df4dfef..084a85b 100644
> --- a/drivers/media/video/stk-webcam.h
> +++ b/drivers/media/video/stk-webcam.h
> @@ -99,7 +99,6 @@ struct stk_camera {
>
> u8 isoc_ep;
>
> - struct kref kref;
> /* Not sure if this is right */
> atomic_t urbs_used;
>
> @@ -121,7 +120,6 @@ struct stk_camera {
> unsigned sequence;
> };
>
> -#define to_stk_camera(d) container_of(d, struct stk_camera, kref)
> #define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
>
> void stk_camera_delete(struct kref *);
> --
> 1.5.5.1
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-07-03 18:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-29 1:40 [RFT v2] stk-webcam: Fix video_device handling David Ellingsworth
2008-06-29 22:34 ` David Ellingsworth
2008-07-01 17:13 ` Jaime Velasco Juan
2008-07-01 19:42 ` David Ellingsworth
2008-07-02 4:01 ` David Ellingsworth
2008-07-03 18:53 ` Jaime Velasco Juan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox