mfd: AB3100 register access change to abx500 API

[safe/jmp/linux-2.6] / drivers / char / sonypi.c

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index dbcb3bd..73f66d0 100644 (file)
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -50,7 +50,7 @@
 #include <linux/err.h>
 #include <linux/kfifo.h>
 #include <linux/platform_device.h>
-#include <linux/smp_lock.h>
+#include <linux/gfp.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -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);
@@ -905,14 +905,13 @@ static int sonypi_misc_release(struct inode *inode, struct file *file)
 
 static int sonypi_misc_open(struct inode *inode, struct file *file)
 {
-       lock_kernel();
        mutex_lock(&sonypi_device.lock);
        /* Flush input queue on first open */
        if (!sonypi_device.open_count)
                kfifo_reset(&sonypi_device.fifo);
        sonypi_device.open_count++;
        mutex_unlock(&sonypi_device.lock);
-       unlock_kernel();
+
        return 0;
 }
 
@@ -932,7 +931,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;
@@ -955,10 +954,10 @@ static unsigned int sonypi_misc_poll(struct file *file, poll_table *wait)
        return 0;
 }
 
-static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
+static long sonypi_misc_ioctl(struct file *fp,
                             unsigned int cmd, unsigned long arg)
 {
-       int ret = 0;
+       long ret = 0;
        void __user *argp = (void __user *)arg;
        u8 val8;
        u16 val16;
@@ -1074,7 +1073,8 @@ static const struct file_operations sonypi_misc_fops = {
        .open           = sonypi_misc_open,
        .release        = sonypi_misc_release,
        .fasync         = sonypi_misc_fasync,
-       .ioctl          = sonypi_misc_ioctl,
+       .unlocked_ioctl = sonypi_misc_ioctl,
+       .llseek         = no_llseek,
 };
 
 static struct miscdevice sonypi_misc_device = {