Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=893e7c2db05f14032f2390ef7c59a499fc25ccae
Commit:     893e7c2db05f14032f2390ef7c59a499fc25ccae
Parent:     8c4df74e02b0853ad86d1595fb6065d6c26fb196
Author:     Dmitry Torokhov <[EMAIL PROTECTED]>
AuthorDate: Wed Jun 13 01:49:58 2007 -0400
Committer:  Dmitry Torokhov <[EMAIL PROTECTED]>
CommitDate: Wed Jun 13 01:49:58 2007 -0400

    Input: move input-polldev to drivers/input
    
    To work around deficiences in Kconfig that allows to "select"
    a symbol without automatically selecting all dependencies for
    that symbol move input-polldev from drivers/input/misc to
    drivers/input thus removing extra dependency on CONFIG_INPUT_MISC.
    
    Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
---
 drivers/input/Kconfig              |   13 +++
 drivers/input/Makefile             |    1 +
 drivers/input/input-polldev.c      |  176 ++++++++++++++++++++++++++++++++++++
 drivers/input/misc/Kconfig         |   11 ---
 drivers/input/misc/Makefile        |    1 -
 drivers/input/misc/input-polldev.c |  176 ------------------------------------
 6 files changed, 190 insertions(+), 188 deletions(-)

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 0e9b695..3cfff40 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -38,6 +38,19 @@ config INPUT_FF_MEMLESS
          To compile this driver as a module, choose M here: the
          module will be called ff-memless.
 
+config INPUT_POLLDEV
+       tristate "Polled input device skeleton"
+       help
+         Say Y here if you are using a driver for an input
+         device that periodically polls hardware state. This
+         option is only useful for out-of-tree drivers since
+         in-tree drivers select it automatically.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called input-polldev.
+
 comment "Userland interfaces"
 
 config INPUT_MOUSEDEV
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 8a2dd98..15eb752 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_INPUT)             += input-core.o
 input-core-objs := input.o ff-core.o
 
 obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o
+obj-$(CONFIG_INPUT_POLLDEV)    += input-polldev.o
 
 obj-$(CONFIG_INPUT_MOUSEDEV)   += mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)     += joydev.o
diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
new file mode 100644
index 0000000..b773d4c
--- /dev/null
+++ b/drivers/input/input-polldev.c
@@ -0,0 +1,176 @@
+/*
+ * Generic implementation of a polled input device
+
+ * Copyright (c) 2007 Dmitry Torokhov
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#include <linux/jiffies.h>
+#include <linux/mutex.h>
+#include <linux/input-polldev.h>
+
+MODULE_AUTHOR("Dmitry Torokhov <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("Generic implementation of a polled input device");
+MODULE_LICENSE("GPL v2");
+MODULE_VERSION("0.1");
+
+static DEFINE_MUTEX(polldev_mutex);
+static int polldev_users;
+static struct workqueue_struct *polldev_wq;
+
+static int input_polldev_start_workqueue(void)
+{
+       int retval;
+
+       retval = mutex_lock_interruptible(&polldev_mutex);
+       if (retval)
+               return retval;
+
+       if (!polldev_users) {
+               polldev_wq = create_singlethread_workqueue("ipolldevd");
+               if (!polldev_wq) {
+                       printk(KERN_ERR "input-polldev: failed to create "
+                               "ipolldevd workqueue\n");
+                       retval = -ENOMEM;
+                       goto out;
+               }
+       }
+
+       polldev_users++;
+
+ out:
+       mutex_unlock(&polldev_mutex);
+       return retval;
+}
+
+static void input_polldev_stop_workqueue(void)
+{
+       mutex_lock(&polldev_mutex);
+
+       if (!--polldev_users)
+               destroy_workqueue(polldev_wq);
+
+       mutex_unlock(&polldev_mutex);
+}
+
+static void input_polled_device_work(struct work_struct *work)
+{
+       struct input_polled_dev *dev =
+               container_of(work, struct input_polled_dev, work.work);
+
+       dev->poll(dev);
+       queue_delayed_work(polldev_wq, &dev->work,
+                          msecs_to_jiffies(dev->poll_interval));
+}
+
+static int input_open_polled_device(struct input_dev *input)
+{
+       struct input_polled_dev *dev = input->private;
+       int error;
+
+       error = input_polldev_start_workqueue();
+       if (error)
+               return error;
+
+       if (dev->flush)
+               dev->flush(dev);
+
+       queue_delayed_work(polldev_wq, &dev->work,
+                          msecs_to_jiffies(dev->poll_interval));
+
+       return 0;
+}
+
+static void input_close_polled_device(struct input_dev *input)
+{
+       struct input_polled_dev *dev = input->private;
+
+       cancel_rearming_delayed_workqueue(polldev_wq, &dev->work);
+       input_polldev_stop_workqueue();
+}
+
+/**
+ * input_allocate_polled_device - allocated memory polled device
+ *
+ * The function allocates memory for a polled device and also
+ * for an input device associated with this polled device.
+ */
+struct input_polled_dev *input_allocate_polled_device(void)
+{
+       struct input_polled_dev *dev;
+
+       dev = kzalloc(sizeof(struct input_polled_dev), GFP_KERNEL);
+       if (!dev)
+               return NULL;
+
+       dev->input = input_allocate_device();
+       if (!dev->input) {
+               kfree(dev);
+               return NULL;
+       }
+
+       return dev;
+}
+EXPORT_SYMBOL(input_allocate_polled_device);
+
+/**
+ * input_free_polled_device - free memory allocated for polled device
+ * @dev: device to free
+ *
+ * The function frees memory allocated for polling device and drops
+ * reference to the associated input device (if present).
+ */
+void input_free_polled_device(struct input_polled_dev *dev)
+{
+       if (dev) {
+               input_free_device(dev->input);
+               kfree(dev);
+       }
+}
+EXPORT_SYMBOL(input_free_polled_device);
+
+/**
+ * input_register_polled_device - register polled device
+ * @dev: device to register
+ *
+ * The function registers previously initialized polled input device
+ * with input layer. The device should be allocated with call to
+ * input_allocate_polled_device(). Callers should also set up poll()
+ * method and set up capabilities (id, name, phys, bits) of the
+ * corresponing input_dev structure.
+ */
+int input_register_polled_device(struct input_polled_dev *dev)
+{
+       struct input_dev *input = dev->input;
+
+       INIT_DELAYED_WORK(&dev->work, input_polled_device_work);
+       if (!dev->poll_interval)
+               dev->poll_interval = 500;
+       input->private = dev;
+       input->open = input_open_polled_device;
+       input->close = input_close_polled_device;
+
+       return input_register_device(input);
+}
+EXPORT_SYMBOL(input_register_polled_device);
+
+/**
+ * input_unregister_polled_device - unregister polled device
+ * @dev: device to unregister
+ *
+ * The function unregisters previously registered polled input
+ * device from input layer. Polling is stopped and device is
+ * ready to be freed with call to input_free_polled_device().
+ * Callers should not attempt to access dev->input pointer
+ * after calling this function.
+ */
+void input_unregister_polled_device(struct input_polled_dev *dev)
+{
+       input_unregister_device(dev->input);
+       dev->input = NULL;
+}
+EXPORT_SYMBOL(input_unregister_polled_device);
+
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 6013ace..98ddafa 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -165,17 +165,6 @@ config INPUT_UINPUT
          To compile this driver as a module, choose M here: the
          module will be called uinput.
 
-config INPUT_POLLDEV
-       tristate "Polled input device skeleton"
-       help
-         Say Y here if you are using a driver for an input
-         device that periodically polls hardware state. This
-         option is only useful for out-of-tree drivers since
-         in-tree drivers select it automatically.
-
-         To compile this driver as a module, choose M here: the
-         module will be called input-polldev.
-
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"
        depends on GSC || HP300
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 8b2f779..3585b50 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -4,7 +4,6 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_INPUT_POLLDEV)            += input-polldev.o
 obj-$(CONFIG_INPUT_SPARCSPKR)          += sparcspkr.o
 obj-$(CONFIG_INPUT_PCSPKR)             += pcspkr.o
 obj-$(CONFIG_INPUT_M68K_BEEP)          += m68kspkr.o
diff --git a/drivers/input/misc/input-polldev.c 
b/drivers/input/misc/input-polldev.c
deleted file mode 100644
index b773d4c..0000000
--- a/drivers/input/misc/input-polldev.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Generic implementation of a polled input device
-
- * Copyright (c) 2007 Dmitry Torokhov
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-
-#include <linux/jiffies.h>
-#include <linux/mutex.h>
-#include <linux/input-polldev.h>
-
-MODULE_AUTHOR("Dmitry Torokhov <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("Generic implementation of a polled input device");
-MODULE_LICENSE("GPL v2");
-MODULE_VERSION("0.1");
-
-static DEFINE_MUTEX(polldev_mutex);
-static int polldev_users;
-static struct workqueue_struct *polldev_wq;
-
-static int input_polldev_start_workqueue(void)
-{
-       int retval;
-
-       retval = mutex_lock_interruptible(&polldev_mutex);
-       if (retval)
-               return retval;
-
-       if (!polldev_users) {
-               polldev_wq = create_singlethread_workqueue("ipolldevd");
-               if (!polldev_wq) {
-                       printk(KERN_ERR "input-polldev: failed to create "
-                               "ipolldevd workqueue\n");
-                       retval = -ENOMEM;
-                       goto out;
-               }
-       }
-
-       polldev_users++;
-
- out:
-       mutex_unlock(&polldev_mutex);
-       return retval;
-}
-
-static void input_polldev_stop_workqueue(void)
-{
-       mutex_lock(&polldev_mutex);
-
-       if (!--polldev_users)
-               destroy_workqueue(polldev_wq);
-
-       mutex_unlock(&polldev_mutex);
-}
-
-static void input_polled_device_work(struct work_struct *work)
-{
-       struct input_polled_dev *dev =
-               container_of(work, struct input_polled_dev, work.work);
-
-       dev->poll(dev);
-       queue_delayed_work(polldev_wq, &dev->work,
-                          msecs_to_jiffies(dev->poll_interval));
-}
-
-static int input_open_polled_device(struct input_dev *input)
-{
-       struct input_polled_dev *dev = input->private;
-       int error;
-
-       error = input_polldev_start_workqueue();
-       if (error)
-               return error;
-
-       if (dev->flush)
-               dev->flush(dev);
-
-       queue_delayed_work(polldev_wq, &dev->work,
-                          msecs_to_jiffies(dev->poll_interval));
-
-       return 0;
-}
-
-static void input_close_polled_device(struct input_dev *input)
-{
-       struct input_polled_dev *dev = input->private;
-
-       cancel_rearming_delayed_workqueue(polldev_wq, &dev->work);
-       input_polldev_stop_workqueue();
-}
-
-/**
- * input_allocate_polled_device - allocated memory polled device
- *
- * The function allocates memory for a polled device and also
- * for an input device associated with this polled device.
- */
-struct input_polled_dev *input_allocate_polled_device(void)
-{
-       struct input_polled_dev *dev;
-
-       dev = kzalloc(sizeof(struct input_polled_dev), GFP_KERNEL);
-       if (!dev)
-               return NULL;
-
-       dev->input = input_allocate_device();
-       if (!dev->input) {
-               kfree(dev);
-               return NULL;
-       }
-
-       return dev;
-}
-EXPORT_SYMBOL(input_allocate_polled_device);
-
-/**
- * input_free_polled_device - free memory allocated for polled device
- * @dev: device to free
- *
- * The function frees memory allocated for polling device and drops
- * reference to the associated input device (if present).
- */
-void input_free_polled_device(struct input_polled_dev *dev)
-{
-       if (dev) {
-               input_free_device(dev->input);
-               kfree(dev);
-       }
-}
-EXPORT_SYMBOL(input_free_polled_device);
-
-/**
- * input_register_polled_device - register polled device
- * @dev: device to register
- *
- * The function registers previously initialized polled input device
- * with input layer. The device should be allocated with call to
- * input_allocate_polled_device(). Callers should also set up poll()
- * method and set up capabilities (id, name, phys, bits) of the
- * corresponing input_dev structure.
- */
-int input_register_polled_device(struct input_polled_dev *dev)
-{
-       struct input_dev *input = dev->input;
-
-       INIT_DELAYED_WORK(&dev->work, input_polled_device_work);
-       if (!dev->poll_interval)
-               dev->poll_interval = 500;
-       input->private = dev;
-       input->open = input_open_polled_device;
-       input->close = input_close_polled_device;
-
-       return input_register_device(input);
-}
-EXPORT_SYMBOL(input_register_polled_device);
-
-/**
- * input_unregister_polled_device - unregister polled device
- * @dev: device to unregister
- *
- * The function unregisters previously registered polled input
- * device from input layer. Polling is stopped and device is
- * ready to be freed with call to input_free_polled_device().
- * Callers should not attempt to access dev->input pointer
- * after calling this function.
- */
-void input_unregister_polled_device(struct input_polled_dev *dev)
-{
-       input_unregister_device(dev->input);
-       dev->input = NULL;
-}
-EXPORT_SYMBOL(input_unregister_polled_device);
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to