Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-block.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index ee6c3234df3634800f257207b3970517d5e68384..3cfd2c18eebd9d6a546c0d259204dc559c8460a1 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -190,6 +190,7 @@ static void input_repeat_key(struct timer_list *t)
                        input_value_sync
                };
 
+               input_set_timestamp(dev, ktime_get());
                input_pass_values(dev, vals, ARRAY_SIZE(vals));
 
                if (dev->rep[REP_PERIOD])
@@ -1216,13 +1217,12 @@ static int input_proc_devices_open(struct inode *inode, struct file *file)
        return seq_open(file, &input_devices_seq_ops);
 }
 
-static const struct file_operations input_devices_fileops = {
-       .owner          = THIS_MODULE,
-       .open           = input_proc_devices_open,
-       .poll           = input_proc_devices_poll,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
+static const struct proc_ops input_devices_proc_ops = {
+       .proc_open      = input_proc_devices_open,
+       .proc_poll      = input_proc_devices_poll,
+       .proc_read      = seq_read,
+       .proc_lseek     = seq_lseek,
+       .proc_release   = seq_release,
 };
 
 static void *input_handlers_seq_start(struct seq_file *seq, loff_t *pos)
@@ -1280,12 +1280,11 @@ static int input_proc_handlers_open(struct inode *inode, struct file *file)
        return seq_open(file, &input_handlers_seq_ops);
 }
 
-static const struct file_operations input_handlers_fileops = {
-       .owner          = THIS_MODULE,
-       .open           = input_proc_handlers_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
+static const struct proc_ops input_handlers_proc_ops = {
+       .proc_open      = input_proc_handlers_open,
+       .proc_read      = seq_read,
+       .proc_lseek     = seq_lseek,
+       .proc_release   = seq_release,
 };
 
 static int __init input_proc_init(void)
@@ -1297,12 +1296,12 @@ static int __init input_proc_init(void)
                return -ENOMEM;
 
        entry = proc_create("devices", 0, proc_bus_input_dir,
-                           &input_devices_fileops);
+                           &input_devices_proc_ops);
        if (!entry)
                goto fail1;
 
        entry = proc_create("handlers", 0, proc_bus_input_dir,
-                           &input_handlers_fileops);
+                           &input_handlers_proc_ops);
        if (!entry)
                goto fail2;