diff options
author | Stefani Seibold <stefani@seibold.net> | 2009-12-21 17:37:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-22 17:17:56 -0500 |
commit | 7acd72eb85f1c7a15e8b5eb554994949241737f1 (patch) | |
tree | 76712bb9f38690d8cf9c2f91bef811e4413d1aa3 /drivers/char/nozomi.c | |
parent | e64c026dd09b73faf20707711402fc5ed55a8e70 (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/char/nozomi.c')
-rw-r--r-- | drivers/char/nozomi.c | 4 |
1 files changed, 2 insertions, 2 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) | |||
798 | struct tty_struct *tty = tty_port_tty_get(&port->port); | 798 | struct tty_struct *tty = tty_port_tty_get(&port->port); |
799 | 799 | ||
800 | /* Get data from tty and place in buf for now */ | 800 | /* Get data from tty and place in buf for now */ |
801 | size = kfifo_get(&port->fifo_ul, dc->send_buf, | 801 | size = kfifo_out(&port->fifo_ul, dc->send_buf, |
802 | ul_size < SEND_BUF_MAX ? ul_size : SEND_BUF_MAX); | 802 | ul_size < SEND_BUF_MAX ? ul_size : SEND_BUF_MAX); |
803 | 803 | ||
804 | if (size == 0) { | 804 | if (size == 0) { |
@@ -1672,7 +1672,7 @@ static int ntty_write(struct tty_struct *tty, const unsigned char *buffer, | |||
1672 | goto exit; | 1672 | goto exit; |
1673 | } | 1673 | } |
1674 | 1674 | ||
1675 | rval = kfifo_put(&port->fifo_ul, (unsigned char *)buffer, count); | 1675 | rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count); |
1676 | 1676 | ||
1677 | /* notify card */ | 1677 | /* notify card */ |
1678 | if (unlikely(dc == NULL)) { | 1678 | if (unlikely(dc == NULL)) { |