- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / staging / cx25821 / cx25821-video1.c

diff --git a/drivers/staging/cx25821/cx25821-video1.c b/drivers/staging/cx25821/cx25821-video1.c
index e3f3c4a..b0bae62 100644 (file)
--- a/drivers/staging/cx25821/cx25821-video1.c
+++ b/drivers/staging/cx25821/cx25821-video1.c
@@ -86,10 +86,10 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 }
 
 static struct videobuf_queue_ops cx25821_video_qops = {
-       .buf_setup = buffer_setup,
-       .buf_prepare = buffer_prepare,
+       .buf_setup = cx25821_buffer_setup,
+       .buf_prepare = cx25821_buffer_prepare,
        .buf_queue = buffer_queue,
-       .buf_release = buffer_release,
+       .buf_release = cx25821_buffer_release,
 };
 
 static int video_open(struct file *file)
@@ -147,7 +147,7 @@ static ssize_t video_read(struct file *file, char __user * data, size_t count,
 
        switch (fh->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-               if (res_locked(fh->dev, RESOURCE_VIDEO1))
+               if (cx25821_res_locked(fh->dev, RESOURCE_VIDEO1))
                        return -EBUSY;
 
                return videobuf_read_one(&fh->vidq, data, count, ppos,
@@ -165,7 +165,7 @@ static unsigned int video_poll(struct file *file,
        struct cx25821_fh *fh = file->private_data;
        struct cx25821_buffer *buf;
 
-       if (res_check(fh, RESOURCE_VIDEO1)) {
+       if (cx25821_res_check(fh, RESOURCE_VIDEO1)) {
                /* streaming capture */
                if (list_empty(&fh->vidq.stream))
                        return POLLERR;
@@ -207,19 +207,19 @@ static int video_release(struct file *file)
        cx_write(channel1->dma_ctl, 0); /* FIFO and RISC disable */
 
        /* stop video capture */
-       if (res_check(fh, RESOURCE_VIDEO1)) {
+       if (cx25821_res_check(fh, RESOURCE_VIDEO1)) {
                videobuf_queue_cancel(&fh->vidq);
-               res_free(dev, fh, RESOURCE_VIDEO1);
+               cx25821_res_free(dev, fh, RESOURCE_VIDEO1);
        }
 
        if (fh->vidq.read_buf) {
-               buffer_release(&fh->vidq, fh->vidq.read_buf);
+               cx25821_buffer_release(&fh->vidq, fh->vidq.read_buf);
                kfree(fh->vidq.read_buf);
        }
 
        videobuf_mmap_free(&fh->vidq);
 
-       v4l2_prio_close(&dev->prio, &fh->prio);
+       v4l2_prio_close(&dev->prio, fh->prio);
        file->private_data = NULL;
        kfree(fh);
 
@@ -239,7 +239,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
                return -EINVAL;
        }
 
-       if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO1)))) {
+       if (unlikely(!cx25821_res_get(dev, fh, cx25821_get_resource(fh, RESOURCE_VIDEO1)))) {
                return -EBUSY;
        }
 
@@ -257,11 +257,11 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
        if (i != fh->type)
                return -EINVAL;
 
-       res = get_resource(fh, RESOURCE_VIDEO1);
+       res = cx25821_get_resource(fh, RESOURCE_VIDEO1);
        err = videobuf_streamoff(get_queue(fh));
        if (err < 0)
                return err;
-       res_free(dev, fh, res);
+       cx25821_res_free(dev, fh, res);
        return 0;
 }
 
@@ -274,13 +274,13 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        int pix_format = 0;
 
        if (fh) {
-               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               err = v4l2_prio_check(&dev->prio, fh->prio);
                if (0 != err)
                        return err;
        }
 
        dprintk(2, "%s()\n", __func__);
-       err = vidioc_try_fmt_vid_cap(file, priv, f);
+       err = cx25821_vidioc_try_fmt_vid_cap(file, priv, f);
 
        if (0 != err)
                return err;
@@ -289,11 +289,11 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        fh->vidq.field = f->fmt.pix.field;
 
        // check if width and height is valid based on set standard
-       if (is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
+       if (cx25821_is_valid_width(f->fmt.pix.width, dev->tvnorm)) {
                fh->width = f->fmt.pix.width;
        }
 
-       if (is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
+       if (cx25821_is_valid_height(f->fmt.pix.height, dev->tvnorm)) {
                fh->height = f->fmt.pix.height;
        }
 
@@ -363,7 +363,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
        int err;
 
        if (fh) {
-               err = v4l2_prio_check(&dev->prio, &fh->prio);
+               err = v4l2_prio_check(&dev->prio, fh->prio);
                if (0 != err)
                        return err;
        }
@@ -378,50 +378,50 @@ static const struct v4l2_file_operations video_fops = {
        .release = video_release,
        .read = video_read,
        .poll = video_poll,
-       .mmap = video_mmap,
+       .mmap = cx25821_video_mmap,
        .ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops video_ioctl_ops = {
-       .vidioc_querycap = vidioc_querycap,
-       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
-       .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
-       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_querycap = cx25821_vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = cx25821_vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = cx25821_vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = cx25821_vidioc_try_fmt_vid_cap,
        .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
-       .vidioc_reqbufs = vidioc_reqbufs,
-       .vidioc_querybuf = vidioc_querybuf,
-       .vidioc_qbuf = vidioc_qbuf,
+       .vidioc_reqbufs = cx25821_vidioc_reqbufs,
+       .vidioc_querybuf = cx25821_vidioc_querybuf,
+       .vidioc_qbuf = cx25821_vidioc_qbuf,
        .vidioc_dqbuf = vidioc_dqbuf,
 #ifdef TUNER_FLAG
-       .vidioc_s_std = vidioc_s_std,
-       .vidioc_querystd = vidioc_querystd,
+       .vidioc_s_std = cx25821_vidioc_s_std,
+       .vidioc_querystd = cx25821_vidioc_querystd,
 #endif
-       .vidioc_cropcap = vidioc_cropcap,
-       .vidioc_s_crop = vidioc_s_crop,
-       .vidioc_g_crop = vidioc_g_crop,
-       .vidioc_enum_input = vidioc_enum_input,
-       .vidioc_g_input = vidioc_g_input,
-       .vidioc_s_input = vidioc_s_input,
-       .vidioc_g_ctrl = vidioc_g_ctrl,
+       .vidioc_cropcap = cx25821_vidioc_cropcap,
+       .vidioc_s_crop = cx25821_vidioc_s_crop,
+       .vidioc_g_crop = cx25821_vidioc_g_crop,
+       .vidioc_enum_input = cx25821_vidioc_enum_input,
+       .vidioc_g_input = cx25821_vidioc_g_input,
+       .vidioc_s_input = cx25821_vidioc_s_input,
+       .vidioc_g_ctrl = cx25821_vidioc_g_ctrl,
        .vidioc_s_ctrl = vidioc_s_ctrl,
-       .vidioc_queryctrl = vidioc_queryctrl,
+       .vidioc_queryctrl = cx25821_vidioc_queryctrl,
        .vidioc_streamon = vidioc_streamon,
        .vidioc_streamoff = vidioc_streamoff,
        .vidioc_log_status = vidioc_log_status,
-       .vidioc_g_priority = vidioc_g_priority,
-       .vidioc_s_priority = vidioc_s_priority,
+       .vidioc_g_priority = cx25821_vidioc_g_priority,
+       .vidioc_s_priority = cx25821_vidioc_s_priority,
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
-       .vidiocgmbuf = vidiocgmbuf,
+       .vidiocgmbuf = cx25821_vidiocgmbuf,
 #endif
 #ifdef TUNER_FLAG
-       .vidioc_g_tuner = vidioc_g_tuner,
-       .vidioc_s_tuner = vidioc_s_tuner,
-       .vidioc_g_frequency = vidioc_g_frequency,
-       .vidioc_s_frequency = vidioc_s_frequency,
+       .vidioc_g_tuner = cx25821_vidioc_g_tuner,
+       .vidioc_s_tuner = cx25821_vidioc_s_tuner,
+       .vidioc_g_frequency = cx25821_vidioc_g_frequency,
+       .vidioc_s_frequency = cx25821_vidioc_s_frequency,
 #endif
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-       .vidioc_g_register = vidioc_g_register,
-       .vidioc_s_register = vidioc_s_register,
+       .vidioc_g_register = cx25821_vidioc_g_register,
+       .vidioc_s_register = cx25821_vidioc_s_register,
 #endif
 };