Skip to content

Commit

Permalink
V4L/DVB (9193): stk-webcam: minor cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Ellingsworth authored and Mauro Carvalho Chehab committed Oct 17, 2008
1 parent 962d699 commit 081d868
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
9 changes: 1 addition & 8 deletions drivers/media/video/stk-webcam.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -714,9 +713,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)
Expand Down Expand Up @@ -773,9 +769,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))
Expand Down Expand Up @@ -1436,7 +1429,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);
Expand Down
1 change: 0 additions & 1 deletion drivers/media/video/stk-webcam.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ struct stk_camera {

#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);
int stk_camera_read_reg(struct stk_camera *, u16, int *);

Expand Down

0 comments on commit 081d868

Please sign in to comment.