aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/meye.c
diff options
context:
space:
mode:
authorStefani Seibold <stefani@seibold.net>2009-12-21 17:37:28 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-22 17:17:56 -0500
commit7acd72eb85f1c7a15e8b5eb554994949241737f1 (patch)
tree76712bb9f38690d8cf9c2f91bef811e4413d1aa3 /drivers/media/video/meye.c
parente64c026dd09b73faf20707711402fc5ed55a8e70 (diff)
kfifo: rename kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...
rename kfifo_put... into kfifo_in... to prevent miss use of old non in kernel-tree drivers ditto for kfifo_get... -> kfifo_out... Improve the prototypes of kfifo_in and kfifo_out to make the kerneldoc annotations more readable. Add mini "howto porting to the new API" in kfifo.h Signed-off-by: Stefani Seibold <stefani@seibold.net> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Andi Kleen <ak@linux.intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media/video/meye.c')
-rw-r--r--drivers/media/video/meye.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 38bcedfd9fec..884a569d60a2 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -800,7 +800,7 @@ again:
800 return IRQ_HANDLED; 800 return IRQ_HANDLED;
801 801
802 if (meye.mchip_mode == MCHIP_HIC_MODE_CONT_OUT) { 802 if (meye.mchip_mode == MCHIP_HIC_MODE_CONT_OUT) {
803 if (kfifo_get_locked(&meye.grabq, (unsigned char *)&reqnr, 803 if (kfifo_out_locked(&meye.grabq, (unsigned char *)&reqnr,
804 sizeof(int), &meye.grabq_lock) != sizeof(int)) { 804 sizeof(int), &meye.grabq_lock) != sizeof(int)) {
805 mchip_free_frame(); 805 mchip_free_frame();
806 return IRQ_HANDLED; 806 return IRQ_HANDLED;
@@ -811,7 +811,7 @@ again:
811 meye.grab_buffer[reqnr].state = MEYE_BUF_DONE; 811 meye.grab_buffer[reqnr].state = MEYE_BUF_DONE;
812 do_gettimeofday(&meye.grab_buffer[reqnr].timestamp); 812 do_gettimeofday(&meye.grab_buffer[reqnr].timestamp);
813 meye.grab_buffer[reqnr].sequence = sequence++; 813 meye.grab_buffer[reqnr].sequence = sequence++;
814 kfifo_put_locked(&meye.doneq, (unsigned char *)&reqnr, 814 kfifo_in_locked(&meye.doneq, (unsigned char *)&reqnr,
815 sizeof(int), &meye.doneq_lock); 815 sizeof(int), &meye.doneq_lock);
816 wake_up_interruptible(&meye.proc_list); 816 wake_up_interruptible(&meye.proc_list);
817 } else { 817 } else {
@@ -821,7 +821,7 @@ again:
821 mchip_free_frame(); 821 mchip_free_frame();
822 goto again; 822 goto again;
823 } 823 }
824 if (kfifo_get_locked(&meye.grabq, (unsigned char *)&reqnr, 824 if (kfifo_out_locked(&meye.grabq, (unsigned char *)&reqnr,
825 sizeof(int), &meye.grabq_lock) != sizeof(int)) { 825 sizeof(int), &meye.grabq_lock) != sizeof(int)) {
826 mchip_free_frame(); 826 mchip_free_frame();
827 goto again; 827 goto again;
@@ -832,7 +832,7 @@ again:
832 meye.grab_buffer[reqnr].state = MEYE_BUF_DONE; 832 meye.grab_buffer[reqnr].state = MEYE_BUF_DONE;
833 do_gettimeofday(&meye.grab_buffer[reqnr].timestamp); 833 do_gettimeofday(&meye.grab_buffer[reqnr].timestamp);
834 meye.grab_buffer[reqnr].sequence = sequence++; 834 meye.grab_buffer[reqnr].sequence = sequence++;
835 kfifo_put_locked(&meye.doneq, (unsigned char *)&reqnr, 835 kfifo_in_locked(&meye.doneq, (unsigned char *)&reqnr,
836 sizeof(int), &meye.doneq_lock); 836 sizeof(int), &meye.doneq_lock);
837 wake_up_interruptible(&meye.proc_list); 837 wake_up_interruptible(&meye.proc_list);
838 } 838 }
@@ -935,7 +935,7 @@ static int meyeioc_qbuf_capt(int *nb)
935 mchip_cont_compression_start(); 935 mchip_cont_compression_start();
936 936
937 meye.grab_buffer[*nb].state = MEYE_BUF_USING; 937 meye.grab_buffer[*nb].state = MEYE_BUF_USING;
938 kfifo_put_locked(&meye.grabq, (unsigned char *)nb, sizeof(int), 938 kfifo_in_locked(&meye.grabq, (unsigned char *)nb, sizeof(int),
939 &meye.grabq_lock); 939 &meye.grabq_lock);
940 mutex_unlock(&meye.lock); 940 mutex_unlock(&meye.lock);
941 941
@@ -968,7 +968,7 @@ static int meyeioc_sync(struct file *file, void *fh, int *i)
968 /* fall through */ 968 /* fall through */
969 case MEYE_BUF_DONE: 969 case MEYE_BUF_DONE:
970 meye.grab_buffer[*i].state = MEYE_BUF_UNUSED; 970 meye.grab_buffer[*i].state = MEYE_BUF_UNUSED;
971 kfifo_get_locked(&meye.doneq, (unsigned char *)&unused, 971 kfifo_out_locked(&meye.doneq, (unsigned char *)&unused,
972 sizeof(int), &meye.doneq_lock); 972 sizeof(int), &meye.doneq_lock);
973 } 973 }
974 *i = meye.grab_buffer[*i].size; 974 *i = meye.grab_buffer[*i].size;
@@ -1456,7 +1456,7 @@ static int vidioc_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
1456 buf->flags |= V4L2_BUF_FLAG_QUEUED; 1456 buf->flags |= V4L2_BUF_FLAG_QUEUED;
1457 buf->flags &= ~V4L2_BUF_FLAG_DONE; 1457 buf->flags &= ~V4L2_BUF_FLAG_DONE;
1458 meye.grab_buffer[buf->index].state = MEYE_BUF_USING; 1458 meye.grab_buffer[buf->index].state = MEYE_BUF_USING;
1459 kfifo_put_locked(&meye.grabq, (unsigned char *)&buf->index, 1459 kfifo_in_locked(&meye.grabq, (unsigned char *)&buf->index,
1460 sizeof(int), &meye.grabq_lock); 1460 sizeof(int), &meye.grabq_lock);
1461 mutex_unlock(&meye.lock); 1461 mutex_unlock(&meye.lock);
1462 1462
@@ -1483,7 +1483,7 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
1483 return -EINTR; 1483 return -EINTR;
1484 } 1484 }
1485 1485
1486 if (!kfifo_get_locked(&meye.doneq, (unsigned char *)&reqnr, 1486 if (!kfifo_out_locked(&meye.doneq, (unsigned char *)&reqnr,
1487 sizeof(int), &meye.doneq_lock)) { 1487 sizeof(int), &meye.doneq_lock)) {
1488 mutex_unlock(&meye.lock); 1488 mutex_unlock(&meye.lock);
1489 return -EBUSY; 1489 return -EBUSY;