Commit f7a9f303 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman

[PATCH] USB: fix functions to match prototypes

parent 0f982aa0
...@@ -4592,7 +4592,7 @@ ov51x_v4l1_ioctl(struct inode *inode, struct file *file, ...@@ -4592,7 +4592,7 @@ ov51x_v4l1_ioctl(struct inode *inode, struct file *file,
return rc; return rc;
} }
static int static ssize_t
ov51x_v4l1_read(struct file *file, char *buf, size_t cnt, loff_t *ppos) ov51x_v4l1_read(struct file *file, char *buf, size_t cnt, loff_t *ppos)
{ {
struct video_device *vdev = file->private_data; struct video_device *vdev = file->private_data;
......
...@@ -129,7 +129,7 @@ static struct { ...@@ -129,7 +129,7 @@ static struct {
static int pwc_video_open(struct inode *inode, struct file *file); static int pwc_video_open(struct inode *inode, struct file *file);
static int pwc_video_close(struct inode *inode, struct file *file); static int pwc_video_close(struct inode *inode, struct file *file);
static int pwc_video_read(struct file *file, char *buf, static ssize_t pwc_video_read(struct file *file, char *buf,
size_t count, loff_t *ppos); size_t count, loff_t *ppos);
static unsigned int pwc_video_poll(struct file *file, poll_table *wait); static unsigned int pwc_video_poll(struct file *file, poll_table *wait);
static int pwc_video_ioctl(struct inode *inode, struct file *file, static int pwc_video_ioctl(struct inode *inode, struct file *file,
...@@ -1116,7 +1116,7 @@ static int pwc_video_close(struct inode *inode, struct file *file) ...@@ -1116,7 +1116,7 @@ static int pwc_video_close(struct inode *inode, struct file *file)
device is tricky anyhow. device is tricky anyhow.
*/ */
static int pwc_video_read(struct file *file, char *buf, static ssize_t pwc_video_read(struct file *file, char *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct video_device *vdev = file->private_data; struct video_device *vdev = file->private_data;
...@@ -1124,7 +1124,7 @@ static int pwc_video_read(struct file *file, char *buf, ...@@ -1124,7 +1124,7 @@ static int pwc_video_read(struct file *file, char *buf,
int noblock = file->f_flags & O_NONBLOCK; int noblock = file->f_flags & O_NONBLOCK;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
Trace(TRACE_READ, "video_read(0x%p, %p, %d) called.\n", vdev, buf, count); Trace(TRACE_READ, "video_read(0x%p, %p, %Zd) called.\n", vdev, buf, count);
if (vdev == NULL) if (vdev == NULL)
return -EFAULT; return -EFAULT;
pdev = vdev->priv; pdev = vdev->priv;
......
...@@ -1121,7 +1121,7 @@ static int se401_ioctl(struct inode *inode, struct file *file, ...@@ -1121,7 +1121,7 @@ static int se401_ioctl(struct inode *inode, struct file *file,
return video_usercopy(inode, file, cmd, arg, se401_do_ioctl); return video_usercopy(inode, file, cmd, arg, se401_do_ioctl);
} }
static int se401_read(struct file *file, char *buf, static ssize_t se401_read(struct file *file, char *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
int realcount=count, ret=0; int realcount=count, ret=0;
......
...@@ -1313,7 +1313,7 @@ static int stv680_mmap (struct file *file, struct vm_area_struct *vma) ...@@ -1313,7 +1313,7 @@ static int stv680_mmap (struct file *file, struct vm_area_struct *vma)
return 0; return 0;
} }
static int stv680_read (struct file *file, char *buf, static ssize_t stv680_read (struct file *file, char *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct video_device *dev = file->private_data; struct video_device *dev = file->private_data;
......
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