diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-13 16:54:52 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-13 16:54:52 -0400 |
| commit | a6cca35edd4cdcab3bcbfc3f3aca5dbdc7bc9f3e (patch) | |
| tree | a36f4e89af9672d858e8880a34331b6af990af71 /linux/drivers/media/video/stk-webcam.c | |
| parent | bf8d46bbb41fcbef67fa3a1e36d5de4d2b012a8e (diff) | |
| download | mediapointer-dvb-s2-a6cca35edd4cdcab3bcbfc3f3aca5dbdc7bc9f3e.tar.gz mediapointer-dvb-s2-a6cca35edd4cdcab3bcbfc3f3aca5dbdc7bc9f3e.tar.bz2 | |
stk-webcam: minor cleanup
From: David Ellingsworth <david@identd.dyndns.org>
This patch:
1) removes the unnecessary kref.h include file
2) removes unnecessary pointer validation from read and poll routines.
(Neither poll nor read may be called unless a call to open succeeds. A
successful call to open will always set the file private_data pointer.
Verifying that it is not null is therefore unnecessary. The associated
release and mmap calls currently ignore this check.)
3) adds a space to syslog output.
4) removes an unused function prototype.
Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/stk-webcam.c')
| -rw-r--r-- | linux/drivers/media/video/stk-webcam.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/linux/drivers/media/video/stk-webcam.c b/linux/drivers/media/video/stk-webcam.c index 8c1817a47..11451518c 100644 --- a/linux/drivers/media/video/stk-webcam.c +++ b/linux/drivers/media/video/stk-webcam.c @@ -27,7 +27,6 @@ #include <linux/kernel.h> #include <linux/errno.h> #include <linux/slab.h> -#include <linux/kref.h> #include <linux/usb.h> #include <linux/mm.h> @@ -715,9 +714,6 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf, struct stk_sio_buffer *sbuf; struct stk_camera *dev = fp->private_data; - if (dev == NULL) - return -EIO; - if (!is_present(dev)) return -EIO; if (dev->owner && dev->owner != fp) @@ -774,9 +770,6 @@ static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait) { struct stk_camera *dev = fp->private_data; - if (dev == NULL) - return -ENODEV; - poll_wait(fp, &dev->wait_frame, wait); if (!is_present(dev)) @@ -1437,7 +1430,7 @@ static void stk_camera_disconnect(struct usb_interface *interface) wake_up_interruptible(&dev->wait_frame); stk_remove_sysfs_files(&dev->vdev); - STK_INFO("Syntek USB2.0 Camera release resources" + STK_INFO("Syntek USB2.0 Camera release resources " "video device /dev/video%d\n", dev->vdev.minor); video_unregister_device(&dev->vdev); |