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>
This commit is contained in:

committed by
Linus Torvalds

parent
e64c026dd0
commit
7acd72eb85
@@ -1006,7 +1006,7 @@ static void acpi_fujitsu_hotkey_notify(struct acpi_device *device, u32 event)
|
||||
vdbg_printk(FUJLAPTOP_DBG_TRACE,
|
||||
"Push keycode into ringbuffer [%d]\n",
|
||||
keycode);
|
||||
status = kfifo_put_locked(&fujitsu_hotkey->fifo,
|
||||
status = kfifo_in_locked(&fujitsu_hotkey->fifo,
|
||||
(unsigned char *)&keycode,
|
||||
sizeof(keycode),
|
||||
&fujitsu_hotkey->fifo_lock);
|
||||
@@ -1020,7 +1020,7 @@ static void acpi_fujitsu_hotkey_notify(struct acpi_device *device, u32 event)
|
||||
}
|
||||
} else if (keycode == 0) {
|
||||
while ((status =
|
||||
kfifo_get_locked(
|
||||
kfifo_out_locked(
|
||||
&fujitsu_hotkey->fifo,
|
||||
(unsigned char *) &keycode_r,
|
||||
sizeof(keycode_r),
|
||||
|
@@ -300,7 +300,7 @@ static void do_sony_laptop_release_key(struct work_struct *work)
|
||||
{
|
||||
struct sony_laptop_keypress kp;
|
||||
|
||||
while (kfifo_get_locked(&sony_laptop_input.fifo, (unsigned char *)&kp,
|
||||
while (kfifo_out_locked(&sony_laptop_input.fifo, (unsigned char *)&kp,
|
||||
sizeof(kp), &sony_laptop_input.fifo_lock)
|
||||
== sizeof(kp)) {
|
||||
msleep(10);
|
||||
@@ -363,7 +363,7 @@ static void sony_laptop_report_input_event(u8 event)
|
||||
/* we emit the scancode so we can always remap the key */
|
||||
input_event(kp.dev, EV_MSC, MSC_SCAN, event);
|
||||
input_sync(kp.dev);
|
||||
kfifo_put_locked(&sony_laptop_input.fifo,
|
||||
kfifo_in_locked(&sony_laptop_input.fifo,
|
||||
(unsigned char *)&kp, sizeof(kp),
|
||||
&sony_laptop_input.fifo_lock);
|
||||
|
||||
@@ -2130,7 +2130,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
|
||||
return ret;
|
||||
|
||||
while (ret < count &&
|
||||
(kfifo_get_locked(&sonypi_compat.fifo, &c, sizeof(c),
|
||||
(kfifo_out_locked(&sonypi_compat.fifo, &c, sizeof(c),
|
||||
&sonypi_compat.fifo_lock) == sizeof(c))) {
|
||||
if (put_user(c, buf++))
|
||||
return -EFAULT;
|
||||
@@ -2310,7 +2310,7 @@ static struct miscdevice sonypi_misc_device = {
|
||||
|
||||
static void sonypi_compat_report_event(u8 event)
|
||||
{
|
||||
kfifo_put_locked(&sonypi_compat.fifo, (unsigned char *)&event,
|
||||
kfifo_in_locked(&sonypi_compat.fifo, (unsigned char *)&event,
|
||||
sizeof(event), &sonypi_compat.fifo_lock);
|
||||
kill_fasync(&sonypi_compat.fifo_async, SIGIO, POLL_IN);
|
||||
wake_up_interruptible(&sonypi_compat.fifo_proc_list);
|
||||
|
Reference in New Issue
Block a user