aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
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/platform
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/platform')
-rw-r--r--drivers/platform/x86/fujitsu-laptop.c4
-rw-r--r--drivers/platform/x86/sony-laptop.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 13dc7bedcfce..b66029bd75d0 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -1006,7 +1006,7 @@ static void acpi_fujitsu_hotkey_notify(struct acpi_device *device, u32 event)
1006 vdbg_printk(FUJLAPTOP_DBG_TRACE, 1006 vdbg_printk(FUJLAPTOP_DBG_TRACE,
1007 "Push keycode into ringbuffer [%d]\n", 1007 "Push keycode into ringbuffer [%d]\n",
1008 keycode); 1008 keycode);
1009 status = kfifo_put_locked(&fujitsu_hotkey->fifo, 1009 status = kfifo_in_locked(&fujitsu_hotkey->fifo,
1010 (unsigned char *)&keycode, 1010 (unsigned char *)&keycode,
1011 sizeof(keycode), 1011 sizeof(keycode),
1012 &fujitsu_hotkey->fifo_lock); 1012 &fujitsu_hotkey->fifo_lock);
@@ -1020,7 +1020,7 @@ static void acpi_fujitsu_hotkey_notify(struct acpi_device *device, u32 event)
1020 } 1020 }
1021 } else if (keycode == 0) { 1021 } else if (keycode == 0) {
1022 while ((status = 1022 while ((status =
1023 kfifo_get_locked( 1023 kfifo_out_locked(
1024 &fujitsu_hotkey->fifo, 1024 &fujitsu_hotkey->fifo,
1025 (unsigned char *) &keycode_r, 1025 (unsigned char *) &keycode_r,
1026 sizeof(keycode_r), 1026 sizeof(keycode_r),
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 36e5dc6fc953..2896ca4cd9ab 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -300,7 +300,7 @@ static void do_sony_laptop_release_key(struct work_struct *work)
300{ 300{
301 struct sony_laptop_keypress kp; 301 struct sony_laptop_keypress kp;
302 302
303 while (kfifo_get_locked(&sony_laptop_input.fifo, (unsigned char *)&kp, 303 while (kfifo_out_locked(&sony_laptop_input.fifo, (unsigned char *)&kp,
304 sizeof(kp), &sony_laptop_input.fifo_lock) 304 sizeof(kp), &sony_laptop_input.fifo_lock)
305 == sizeof(kp)) { 305 == sizeof(kp)) {
306 msleep(10); 306 msleep(10);
@@ -363,7 +363,7 @@ static void sony_laptop_report_input_event(u8 event)
363 /* we emit the scancode so we can always remap the key */ 363 /* we emit the scancode so we can always remap the key */
364 input_event(kp.dev, EV_MSC, MSC_SCAN, event); 364 input_event(kp.dev, EV_MSC, MSC_SCAN, event);
365 input_sync(kp.dev); 365 input_sync(kp.dev);
366 kfifo_put_locked(&sony_laptop_input.fifo, 366 kfifo_in_locked(&sony_laptop_input.fifo,
367 (unsigned char *)&kp, sizeof(kp), 367 (unsigned char *)&kp, sizeof(kp),
368 &sony_laptop_input.fifo_lock); 368 &sony_laptop_input.fifo_lock);
369 369
@@ -2130,7 +2130,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
2130 return ret; 2130 return ret;
2131 2131
2132 while (ret < count && 2132 while (ret < count &&
2133 (kfifo_get_locked(&sonypi_compat.fifo, &c, sizeof(c), 2133 (kfifo_out_locked(&sonypi_compat.fifo, &c, sizeof(c),
2134 &sonypi_compat.fifo_lock) == sizeof(c))) { 2134 &sonypi_compat.fifo_lock) == sizeof(c))) {
2135 if (put_user(c, buf++)) 2135 if (put_user(c, buf++))
2136 return -EFAULT; 2136 return -EFAULT;
@@ -2310,7 +2310,7 @@ static struct miscdevice sonypi_misc_device = {
2310 2310
2311static void sonypi_compat_report_event(u8 event) 2311static void sonypi_compat_report_event(u8 event)
2312{ 2312{
2313 kfifo_put_locked(&sonypi_compat.fifo, (unsigned char *)&event, 2313 kfifo_in_locked(&sonypi_compat.fifo, (unsigned char *)&event,
2314 sizeof(event), &sonypi_compat.fifo_lock); 2314 sizeof(event), &sonypi_compat.fifo_lock);
2315 kill_fasync(&sonypi_compat.fifo_async, SIGIO, POLL_IN); 2315 kill_fasync(&sonypi_compat.fifo_async, SIGIO, POLL_IN);
2316 wake_up_interruptible(&sonypi_compat.fifo_proc_list); 2316 wake_up_interruptible(&sonypi_compat.fifo_proc_list);