Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[pandora-kernel.git] / drivers / media / video / cx18 / cx18-fileops.c

diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 9f23b90..e9802d9 100644 (file)
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -160,13 +160,10 @@ EXPORT_SYMBOL(cx18_release_stream);
 static void cx18_dualwatch(struct cx18 *cx)
 {
        struct v4l2_tuner vt;
-       u32 new_bitmap;
        u32 new_stereo_mode;
-       const u32 stereo_mask = 0x0300;
        const u32 dual = 0x0200;
-       u32 h;
 
-       new_stereo_mode = cx->params.audio_properties & stereo_mask;
+       new_stereo_mode = v4l2_ctrl_g_ctrl(cx->cxhdl.audio_mode);
        memset(&vt, 0, sizeof(vt));
        cx18_call_all(cx, tuner, g_tuner, &vt);
        if (vt.audmode == V4L2_TUNER_MODE_LANG1_LANG2 &&
@@ -176,25 +173,10 @@ static void cx18_dualwatch(struct cx18 *cx)
        if (new_stereo_mode == cx->dualwatch_stereo_mode)
                return;
 
-       new_bitmap = new_stereo_mode
-                       | (cx->params.audio_properties & ~stereo_mask);
-
-       CX18_DEBUG_INFO("dualwatch: change stereo flag from 0x%x to 0x%x. "
-                       "new audio_bitmask=0x%ux\n",
-                       cx->dualwatch_stereo_mode, new_stereo_mode, new_bitmap);
-
-       h = cx18_find_handle(cx);
-       if (h == CX18_INVALID_TASK_HANDLE) {
-               CX18_DEBUG_INFO("dualwatch: can't find valid task handle\n");
-               return;
-       }
-
-       if (cx18_vapi(cx,
-                     CX18_CPU_SET_AUDIO_PARAMETERS, 2, h, new_bitmap) == 0) {
-               cx->dualwatch_stereo_mode = new_stereo_mode;
-               return;
-       }
-       CX18_DEBUG_INFO("dualwatch: changing stereo flag failed\n");
+       CX18_DEBUG_INFO("dualwatch: change stereo flag from 0x%x to 0x%x.\n",
+                          cx->dualwatch_stereo_mode, new_stereo_mode);
+       if (v4l2_ctrl_s_ctrl(cx->cxhdl.audio_mode, new_stereo_mode))
+               CX18_DEBUG_INFO("dualwatch: changing stereo flag failed\n");
 }
 
 
@@ -603,7 +585,7 @@ start_failed:
 ssize_t cx18_v4l2_read(struct file *filp, char __user *buf, size_t count,
                loff_t *pos)
 {
-       struct cx18_open_id *id = filp->private_data;
+       struct cx18_open_id *id = file2id(filp);
        struct cx18 *cx = id->cx;
        struct cx18_stream *s = &cx->streams[id->type];
        int rc;
@@ -620,7 +602,7 @@ ssize_t cx18_v4l2_read(struct file *filp, char __user *buf, size_t count,
 
 unsigned int cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
 {
-       struct cx18_open_id *id = filp->private_data;
+       struct cx18_open_id *id = file2id(filp);
        struct cx18 *cx = id->cx;
        struct cx18_stream *s = &cx->streams[id->type];
        int eof = test_bit(CX18_F_S_STREAMOFF, &s->s_flags);
@@ -694,13 +676,15 @@ void cx18_stop_capture(struct cx18_open_id *id, int gop_end)
 
 int cx18_v4l2_close(struct file *filp)
 {
-       struct cx18_open_id *id = filp->private_data;
+       struct v4l2_fh *fh = filp->private_data;
+       struct cx18_open_id *id = fh2id(fh);
        struct cx18 *cx = id->cx;
        struct cx18_stream *s = &cx->streams[id->type];
 
        CX18_DEBUG_IOCTL("close() of %s\n", s->name);
 
-       v4l2_prio_close(&cx->prio, id->prio);
+       v4l2_fh_del(fh);
+       v4l2_fh_exit(fh);
 
        /* Easy case first: this stream was never claimed by us */
        if (s->id != id->open_id) {
@@ -724,8 +708,8 @@ int cx18_v4l2_close(struct file *filp)
                if (atomic_read(&cx->ana_capturing) > 0) {
                        /* Undo video mute */
                        cx18_vapi(cx, CX18_CPU_SET_VIDEO_MUTE, 2, s->handle,
-                               cx->params.video_mute |
-                                       (cx->params.video_mute_yuv << 8));
+                           (v4l2_ctrl_g_ctrl(cx->cxhdl.video_mute) |
+                           (v4l2_ctrl_g_ctrl(cx->cxhdl.video_mute_yuv) << 8)));
                }
                /* Done! Unmute and continue. */
                cx18_unmute(cx);
@@ -746,22 +730,24 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)
        CX18_DEBUG_FILE("open %s\n", s->name);
 
        /* Allocate memory */
-       item = kmalloc(sizeof(struct cx18_open_id), GFP_KERNEL);
+       item = kzalloc(sizeof(struct cx18_open_id), GFP_KERNEL);
        if (NULL == item) {
                CX18_DEBUG_WARN("nomem on v4l2 open\n");
                return -ENOMEM;
        }
+       v4l2_fh_init(&item->fh, s->video_dev);
+
        item->cx = cx;
        item->type = s->type;
-       v4l2_prio_open(&cx->prio, &item->prio);
 
        item->open_id = cx->open_id++;
-       filp->private_data = item;
+       filp->private_data = &item->fh;
 
        if (item->type == CX18_ENC_STREAM_TYPE_RAD) {
                /* Try to claim this stream */
                if (cx18_claim_stream(item, item->type)) {
                        /* No, it's already in use */
+                       v4l2_fh_exit(&item->fh);
                        kfree(item);
                        return -EBUSY;
                }
@@ -771,6 +757,7 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)
                                /* switching to radio while capture is
                                   in progress is not polite */
                                cx18_release_stream(s);
+                               v4l2_fh_exit(&item->fh);
                                kfree(item);
                                return -EBUSY;
                        }
@@ -787,6 +774,7 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)
                /* Done! Unmute and continue. */
                cx18_unmute(cx);
        }
+       v4l2_fh_add(&item->fh);
        return 0;
 }