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>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 61f5bfe74f38..9ef243429014 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -798,7 +798,7 @@ static int send_data(enum port_type index, struct nozomi *dc)
         struct tty_struct *tty = tty_port_tty_get(&port->port);
 
         /* Get data from tty and place in buf for now */
-        size = kfifo_get(&port->fifo_ul, dc->send_buf,
+        size = kfifo_out(&port->fifo_ul, dc->send_buf,
                            ul_size < SEND_BUF_MAX ? ul_size : SEND_BUF_MAX);
 
         if (size == 0) {
@@ -1672,7 +1672,7 @@ static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
                 goto exit;
         }
 
-        rval = kfifo_put(&port->fifo_ul, (unsigned char *)buffer, count);
+        rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count);
 
         /* notify card */
         if (unlikely(dc == NULL)) {
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index dbcb3bd192c7..0798754a607c 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -777,7 +777,7 @@ static void input_keyrelease(struct work_struct *work)
 {
         struct sonypi_keypress kp;
 
-        while (kfifo_get_locked(&sonypi_device.input_fifo, (unsigned char *)&kp,
+        while (kfifo_out_locked(&sonypi_device.input_fifo, (unsigned char *)&kp,
                          sizeof(kp), &sonypi_device.input_fifo_lock)
                         == sizeof(kp)) {
                 msleep(10);
@@ -828,7 +828,7 @@ static void sonypi_report_input_event(u8 event)
         if (kp.dev) {
                 input_report_key(kp.dev, kp.key, 1);
                 input_sync(kp.dev);
-                kfifo_put_locked(&sonypi_device.input_fifo,
+                kfifo_in_locked(&sonypi_device.input_fifo,
                         (unsigned char *)&kp, sizeof(kp),
                         &sonypi_device.input_fifo_lock);
                 schedule_work(&sonypi_device.input_work);
@@ -882,7 +882,7 @@ found:
                 acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event);
 #endif
 
-        kfifo_put_locked(&sonypi_device.fifo, (unsigned char *)&event,
+        kfifo_in_locked(&sonypi_device.fifo, (unsigned char *)&event,
                         sizeof(event), &sonypi_device.fifo_lock);
         kill_fasync(&sonypi_device.fifo_async, SIGIO, POLL_IN);
         wake_up_interruptible(&sonypi_device.fifo_proc_list);
@@ -932,7 +932,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
                 return ret;
 
         while (ret < count &&
-               (kfifo_get_locked(&sonypi_device.fifo, &c, sizeof(c),
+               (kfifo_out_locked(&sonypi_device.fifo, &c, sizeof(c),
                                  &sonypi_device.fifo_lock) == sizeof(c))) {
                 if (put_user(c, buf++))
                         return -EFAULT;