sched: stop wake_affine from causing serious imbalance

[linux-2.6-omap-h63xx.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 307c7b5c2b33a59fa33825523cca639af4f4ccd2..27006fc1830567f30c87bc16a323cd826bd0ab46 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -235,6 +235,10 @@ static void input_handle_event(struct input_dev *dev,
                if (value >= 0)
                        disposition = INPUT_PASS_TO_ALL;
                break;
+
+       case EV_PWR:
+               disposition = INPUT_PASS_TO_ALL;
+               break;
        }
 
        if (type != EV_SYN)
@@ -489,7 +493,7 @@ static void input_disconnect_device(struct input_dev *dev)
        if (is_event_supported(EV_KEY, dev->evbit, EV_MAX)) {
                for (code = 0; code <= KEY_MAX; code++) {
                        if (is_event_supported(code, dev->keybit, KEY_MAX) &&
-                           test_bit(code, dev->key)) {
+                           __test_and_clear_bit(code, dev->key)) {
                                input_pass_event(dev, EV_KEY, code, 0);
                        }
                }
@@ -522,7 +526,7 @@ static int input_default_getkeycode(struct input_dev *dev,
        if (!dev->keycodesize)
                return -EINVAL;
 
-       if (scancode < 0 || scancode >= dev->keycodemax)
+       if (scancode >= dev->keycodemax)
                return -EINVAL;
 
        *keycode = input_fetch_keycode(dev, scancode);
@@ -536,10 +540,7 @@ static int input_default_setkeycode(struct input_dev *dev,
        int old_keycode;
        int i;
 
-       if (scancode < 0 || scancode >= dev->keycodemax)
-               return -EINVAL;
-
-       if (keycode < 0 || keycode > KEY_MAX)
+       if (scancode >= dev->keycodemax)
                return -EINVAL;
 
        if (!dev->keycodesize)
@@ -582,6 +583,75 @@ static int input_default_setkeycode(struct input_dev *dev,
        return 0;
 }
 
+/**
+ * input_get_keycode - retrieve keycode currently mapped to a given scancode
+ * @dev: input device which keymap is being queried
+ * @scancode: scancode (or its equivalent for device in question) for which
+ *     keycode is needed
+ * @keycode: result
+ *
+ * This function should be called by anyone interested in retrieving current
+ * keymap. Presently keyboard and evdev handlers use it.
+ */
+int input_get_keycode(struct input_dev *dev, int scancode, int *keycode)
+{
+       if (scancode < 0)
+               return -EINVAL;
+
+       return dev->getkeycode(dev, scancode, keycode);
+}
+EXPORT_SYMBOL(input_get_keycode);
+
+/**
+ * input_get_keycode - assign new keycode to a given scancode
+ * @dev: input device which keymap is being updated
+ * @scancode: scancode (or its equivalent for device in question)
+ * @keycode: new keycode to be assigned to the scancode
+ *
+ * This function should be called by anyone needing to update current
+ * keymap. Presently keyboard and evdev handlers use it.
+ */
+int input_set_keycode(struct input_dev *dev, int scancode, int keycode)
+{
+       unsigned long flags;
+       int old_keycode;
+       int retval;
+
+       if (scancode < 0)
+               return -EINVAL;
+
+       if (keycode < 0 || keycode > KEY_MAX)
+               return -EINVAL;
+
+       spin_lock_irqsave(&dev->event_lock, flags);
+
+       retval = dev->getkeycode(dev, scancode, &old_keycode);
+       if (retval)
+               goto out;
+
+       retval = dev->setkeycode(dev, scancode, keycode);
+       if (retval)
+               goto out;
+
+       /*
+        * Simulate keyup event if keycode is not present
+        * in the keymap anymore
+        */
+       if (test_bit(EV_KEY, dev->evbit) &&
+           !is_event_supported(old_keycode, dev->keybit, KEY_MAX) &&
+           __test_and_clear_bit(old_keycode, dev->key)) {
+
+               input_pass_event(dev, EV_KEY, old_keycode, 0);
+               if (dev->sync)
+                       input_pass_event(dev, EV_SYN, SYN_REPORT, 1);
+       }
+
+ out:
+       spin_unlock_irqrestore(&dev->event_lock, flags);
+
+       return retval;
+}
+EXPORT_SYMBOL(input_set_keycode);
 
 #define MATCH_BIT(bit, max) \
                for (i = 0; i < BITS_TO_LONGS(max); i++) \
@@ -751,7 +821,7 @@ static int input_devices_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations input_devices_seq_ops = {
+static const struct seq_operations input_devices_seq_ops = {
        .start  = input_devices_seq_start,
        .next   = input_devices_seq_next,
        .stop   = input_devices_seq_stop,
@@ -804,7 +874,7 @@ static int input_handlers_seq_show(struct seq_file *seq, void *v)
 
        return 0;
 }
-static struct seq_operations input_handlers_seq_ops = {
+static const struct seq_operations input_handlers_seq_ops = {
        .start  = input_handlers_seq_start,
        .next   = input_handlers_seq_next,
        .stop   = input_handlers_seq_stop,
@@ -828,30 +898,26 @@ static int __init input_proc_init(void)
 {
        struct proc_dir_entry *entry;
 
-       proc_bus_input_dir = proc_mkdir("input", proc_bus);
+       proc_bus_input_dir = proc_mkdir("bus/input", NULL);
        if (!proc_bus_input_dir)
                return -ENOMEM;
 
        proc_bus_input_dir->owner = THIS_MODULE;
 
-       entry = create_proc_entry("devices", 0, proc_bus_input_dir);
+       entry = proc_create("devices", 0, proc_bus_input_dir,
+                           &input_devices_fileops);
        if (!entry)
                goto fail1;
 
-       entry->owner = THIS_MODULE;
-       entry->proc_fops = &input_devices_fileops;
-
-       entry = create_proc_entry("handlers", 0, proc_bus_input_dir);
+       entry = proc_create("handlers", 0, proc_bus_input_dir,
+                           &input_handlers_fileops);
        if (!entry)
                goto fail2;
 
-       entry->owner = THIS_MODULE;
-       entry->proc_fops = &input_handlers_fileops;
-
        return 0;
 
  fail2:        remove_proc_entry("devices", proc_bus_input_dir);
- fail1: remove_proc_entry("input", proc_bus);
+ fail1: remove_proc_entry("bus/input", NULL);
        return -ENOMEM;
 }
 
@@ -859,7 +925,7 @@ static void input_proc_exit(void)
 {
        remove_proc_entry("devices", proc_bus_input_dir);
        remove_proc_entry("handlers", proc_bus_input_dir);
-       remove_proc_entry("input", proc_bus);
+       remove_proc_entry("bus/input", NULL);
 }
 
 #else /* !CONFIG_PROC_FS */
@@ -1266,6 +1332,10 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int
                __set_bit(code, dev->ffbit);
                break;
 
+       case EV_PWR:
+               /* do nothing */
+               break;
+
        default:
                printk(KERN_ERR
                        "input_set_capability: unknown type %u (code %u)\n",
@@ -1321,9 +1391,6 @@ int input_register_device(struct input_dev *dev)
        snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
                 "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);
 
-       if (dev->cdev.dev)
-               dev->dev.parent = dev->cdev.dev;
-
        error = device_add(&dev->dev);
        if (error)
                return error;