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

Pull input updates from Dmitry Torokhov:
 "A few drivers were updated with device tree bindings and others got a
  few small cleanups and fixes."

Fix trivial conflict in drivers/input/keyboard/omap-keypad.c due to
changes clashing with a whitespace cleanup.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (28 commits)
  Input: wacom - mark Intuos5 pad as in-prox when touching buttons
  Input: synaptics - adjust threshold for treating position values as negative
  Input: hgpk - use %*ph to dump small buffer
  Input: gpio_keys_polled - fix dt pdata->nbuttons
  Input: Add KD[GS]KBDIACRUC ioctls to the compatible list
  Input: omap-keypad - fixed formatting
  Input: tegra - move platform data header
  Input: wacom - add support for EMR on Cintiq 24HD touch
  Input: s3c2410_ts - make s3c_ts_pmops const
  Input: samsung-keypad - use of_get_child_count() helper
  Input: samsung-keypad - use of_match_ptr()
  Input: uinput - fix formatting
  Input: uinput - specify exact bit sizes on userspace APIs
  Input: uinput - mark failed submission requests as free
  Input: uinput - fix race that can block nonblocking read
  Input: uinput - return -EINVAL when read buffer size is too small
  Input: uinput - take event lock when fetching events from buffer
  Input: get rid of MATCH_BIT() macro
  Input: rotary-encoder - add DT bindings
  Input: rotary-encoder - constify platform data pointers
  ...

3 files changed, 218 insertions, 120 deletions

diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index f07f784198b9..99a49e4968d2 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -24,12 +24,14 @@
 #include <linux/gpio.h>
 #include <linux/rotary_encoder.h>
 #include <linux/slab.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
 
 #define DRV_NAME "rotary-encoder"
 
 struct rotary_encoder {
         struct input_dev *input;
-        struct rotary_encoder_platform_data *pdata;
+        const struct rotary_encoder_platform_data *pdata;
 
         unsigned int axis;
         unsigned int pos;
@@ -43,7 +45,7 @@ struct rotary_encoder {
         char last_stable;
 };
 
-static int rotary_encoder_get_state(struct rotary_encoder_platform_data *pdata)
+static int rotary_encoder_get_state(const struct rotary_encoder_platform_data *pdata)
 {
         int a = !!gpio_get_value(pdata->gpio_a);
         int b = !!gpio_get_value(pdata->gpio_b);
@@ -56,7 +58,7 @@ static int rotary_encoder_get_state(struct rotary_encoder_platform_data *pdata)
 
 static void rotary_encoder_report_event(struct rotary_encoder *encoder)
 {
-        struct rotary_encoder_platform_data *pdata = encoder->pdata;
+        const struct rotary_encoder_platform_data *pdata = encoder->pdata;
 
         if (pdata->relative_axis) {
                 input_report_rel(encoder->input,
@@ -140,36 +142,89 @@ static irqreturn_t rotary_encoder_half_period_irq(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id rotary_encoder_of_match[] = {
+        { .compatible = "rotary-encoder", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, rotary_encoder_of_match);
+
+static struct rotary_encoder_platform_data * __devinit
+rotary_encoder_parse_dt(struct device *dev)
+{
+        const struct of_device_id *of_id =
+                                of_match_device(rotary_encoder_of_match, dev);
+        struct device_node *np = dev->of_node;
+        struct rotary_encoder_platform_data *pdata;
+        enum of_gpio_flags flags;
+
+        if (!of_id || !np)
+                return NULL;
+
+        pdata = kzalloc(sizeof(struct rotary_encoder_platform_data),
+                        GFP_KERNEL);
+        if (!pdata)
+                return ERR_PTR(-ENOMEM);
+
+        of_property_read_u32(np, "rotary-encoder,steps", &pdata->steps);
+        of_property_read_u32(np, "linux,axis", &pdata->axis);
+
+        pdata->gpio_a = of_get_gpio_flags(np, 0, &flags);
+        pdata->inverted_a = flags & OF_GPIO_ACTIVE_LOW;
+
+        pdata->gpio_b = of_get_gpio_flags(np, 1, &flags);
+        pdata->inverted_b = flags & OF_GPIO_ACTIVE_LOW;
+
+        pdata->relative_axis = !!of_get_property(np,
+                                        "rotary-encoder,relative-axis", NULL);
+        pdata->rollover = !!of_get_property(np,
+                                        "rotary-encoder,rollover", NULL);
+        pdata->half_period = !!of_get_property(np,
+                                        "rotary-encoder,half-period", NULL);
+
+        return pdata;
+}
+#else
+static inline struct rotary_encoder_platform_data *
+rotary_encoder_parse_dt(struct device *dev)
+{
+        return NULL;
+}
+#endif
+
 static int __devinit rotary_encoder_probe(struct platform_device *pdev)
 {
-        struct rotary_encoder_platform_data *pdata = pdev->dev.platform_data;
+        struct device *dev = &pdev->dev;
+        const struct rotary_encoder_platform_data *pdata = dev_get_platdata(dev);
         struct rotary_encoder *encoder;
         struct input_dev *input;
         irq_handler_t handler;
         int err;
 
         if (!pdata) {
-                dev_err(&pdev->dev, "missing platform data\n");
-                return -ENOENT;
+                pdata = rotary_encoder_parse_dt(dev);
+                if (IS_ERR(pdata))
+                        return PTR_ERR(pdata);
+
+                if (!pdata) {
+                        dev_err(dev, "missing platform data\n");
+                        return -EINVAL;
+                }
         }
 
         encoder = kzalloc(sizeof(struct rotary_encoder), GFP_KERNEL);
         input = input_allocate_device();
         if (!encoder || !input) {
-                dev_err(&pdev->dev, "failed to allocate memory for device\n");
                 err = -ENOMEM;
                 goto exit_free_mem;
         }
 
         encoder->input = input;
         encoder->pdata = pdata;
-        encoder->irq_a = gpio_to_irq(pdata->gpio_a);
-        encoder->irq_b = gpio_to_irq(pdata->gpio_b);
 
-        /* create and register the input driver */
         input->name = pdev->name;
         input->id.bustype = BUS_HOST;
-        input->dev.parent = &pdev->dev;
+        input->dev.parent = dev;
 
         if (pdata->relative_axis) {
                 input->evbit[0] = BIT_MASK(EV_REL);
@@ -180,40 +235,21 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                                      pdata->axis, 0, pdata->steps, 0, 1);
         }
 
-        err = input_register_device(input);
-        if (err) {
-                dev_err(&pdev->dev, "failed to register input device\n");
-                goto exit_free_mem;
-        }
-
         /* request the GPIOs */
-        err = gpio_request(pdata->gpio_a, DRV_NAME);
-        if (err) {
-                dev_err(&pdev->dev, "unable to request GPIO %d\n",
-                        pdata->gpio_a);
-                goto exit_unregister_input;
-        }
-
-        err = gpio_direction_input(pdata->gpio_a);
+        err = gpio_request_one(pdata->gpio_a, GPIOF_IN, dev_name(dev));
         if (err) {
-                dev_err(&pdev->dev, "unable to set GPIO %d for input\n",
-                        pdata->gpio_a);
-                goto exit_unregister_input;
+                dev_err(dev, "unable to request GPIO %d\n", pdata->gpio_a);
+                goto exit_free_mem;
         }
 
-        err = gpio_request(pdata->gpio_b, DRV_NAME);
+        err = gpio_request_one(pdata->gpio_b, GPIOF_IN, dev_name(dev));
         if (err) {
-                dev_err(&pdev->dev, "unable to request GPIO %d\n",
-                        pdata->gpio_b);
+                dev_err(dev, "unable to request GPIO %d\n", pdata->gpio_b);
                 goto exit_free_gpio_a;
         }
 
-        err = gpio_direction_input(pdata->gpio_b);
-        if (err) {
-                dev_err(&pdev->dev, "unable to set GPIO %d for input\n",
-                        pdata->gpio_b);
-                goto exit_free_gpio_a;
-        }
+        encoder->irq_a = gpio_to_irq(pdata->gpio_a);
+        encoder->irq_b = gpio_to_irq(pdata->gpio_b);
 
         /* request the IRQs */
         if (pdata->half_period) {
@@ -227,8 +263,7 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                           IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                           DRV_NAME, encoder);
         if (err) {
-                dev_err(&pdev->dev, "unable to request IRQ %d\n",
-                        encoder->irq_a);
+                dev_err(dev, "unable to request IRQ %d\n", encoder->irq_a);
                 goto exit_free_gpio_b;
         }
 
@@ -236,43 +271,55 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                           IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                           DRV_NAME, encoder);
         if (err) {
-                dev_err(&pdev->dev, "unable to request IRQ %d\n",
-                        encoder->irq_b);
+                dev_err(dev, "unable to request IRQ %d\n", encoder->irq_b);
                 goto exit_free_irq_a;
         }
 
+        err = input_register_device(input);
+        if (err) {
+                dev_err(dev, "failed to register input device\n");
+                goto exit_free_irq_b;
+        }
+
         platform_set_drvdata(pdev, encoder);
 
         return 0;
 
+exit_free_irq_b:
+        free_irq(encoder->irq_b, encoder);
 exit_free_irq_a:
         free_irq(encoder->irq_a, encoder);
 exit_free_gpio_b:
         gpio_free(pdata->gpio_b);
 exit_free_gpio_a:
         gpio_free(pdata->gpio_a);
-exit_unregister_input:
-        input_unregister_device(input);
-        input = NULL; /* so we don't try to free it */
 exit_free_mem:
         input_free_device(input);
         kfree(encoder);
+        if (!dev_get_platdata(&pdev->dev))
+                kfree(pdata);
+
         return err;
 }
 
 static int __devexit rotary_encoder_remove(struct platform_device *pdev)
 {
         struct rotary_encoder *encoder = platform_get_drvdata(pdev);
-        struct rotary_encoder_platform_data *pdata = pdev->dev.platform_data;
+        const struct rotary_encoder_platform_data *pdata = encoder->pdata;
 
         free_irq(encoder->irq_a, encoder);
         free_irq(encoder->irq_b, encoder);
         gpio_free(pdata->gpio_a);
         gpio_free(pdata->gpio_b);
+
         input_unregister_device(encoder->input);
-        platform_set_drvdata(pdev, NULL);
         kfree(encoder);
 
+        if (!dev_get_platdata(&pdev->dev))
+                kfree(pdata);
+
+        platform_set_drvdata(pdev, NULL);
+
         return 0;
 }
 
@@ -282,6 +329,7 @@ static struct platform_driver rotary_encoder_driver = {
         .driver         = {
                 .name   = DRV_NAME,
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(rotary_encoder_of_match),
         }
 };
 module_platform_driver(rotary_encoder_driver);
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index 38e4b507b94c..b3dd96d6448b 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -42,6 +42,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
         err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &value,
                                 STS_HW_CONDITIONS);
         if (!err)  {
+                pm_wakeup_event(pwr->dev.parent, 0);
                 input_report_key(pwr, KEY_POWER, value & PWR_PWRON_IRQ);
                 input_sync(pwr);
         } else {
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 6b1797503e34..a0a4bbaef02c 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -40,7 +40,8 @@
 #include <linux/input/mt.h>
 #include "../input-compat.h"
 
-static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+static int uinput_dev_event(struct input_dev *dev,
+                            unsigned int type, unsigned int code, int value)
 {
         struct uinput_device    *udev = input_get_drvdata(dev);
 
@@ -56,10 +57,11 @@ static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned i
 }
 
 /* Atomically allocate an ID for the given request. Returns 0 on success. */
-static int uinput_request_alloc_id(struct uinput_device *udev, struct uinput_request *request)
+static bool uinput_request_alloc_id(struct uinput_device *udev,
+                                    struct uinput_request *request)
 {
-        int id;
-        int err = -1;
+        unsigned int id;
+        bool reserved = false;
 
         spin_lock(&udev->requests_lock);
 
@@ -67,32 +69,35 @@ static int uinput_request_alloc_id(struct uinput_device *udev, struct uinput_req
                 if (!udev->requests[id]) {
                         request->id = id;
                         udev->requests[id] = request;
-                        err = 0;
+                        reserved = true;
                         break;
                 }
         }
 
         spin_unlock(&udev->requests_lock);
-        return err;
+        return reserved;
 }
 
-static struct uinput_request *uinput_request_find(struct uinput_device *udev, int id)
+static struct uinput_request *uinput_request_find(struct uinput_device *udev,
+                                                  unsigned int id)
 {
         /* Find an input request, by ID. Returns NULL if the ID isn't valid. */
-        if (id >= UINPUT_NUM_REQUESTS || id < 0)
+        if (id >= UINPUT_NUM_REQUESTS)
                 return NULL;
 
         return udev->requests[id];
 }
 
-static inline int uinput_request_reserve_slot(struct uinput_device *udev, struct uinput_request *request)
+static int uinput_request_reserve_slot(struct uinput_device *udev,
+                                       struct uinput_request *request)
 {
         /* Allocate slot. If none are available right away, wait. */
         return wait_event_interruptible(udev->requests_waitq,
-                                        !uinput_request_alloc_id(udev, request));
+                                        uinput_request_alloc_id(udev, request));
 }
 
-static void uinput_request_done(struct uinput_device *udev, struct uinput_request *request)
+static void uinput_request_done(struct uinput_device *udev,
+                                struct uinput_request *request)
 {
         /* Mark slot as available */
         udev->requests[request->id] = NULL;
@@ -101,14 +106,11 @@ static void uinput_request_done(struct uinput_device *udev, struct uinput_reques
         complete(&request->done);
 }
 
-static int uinput_request_submit(struct uinput_device *udev, struct uinput_request *request)
+static int uinput_request_send(struct uinput_device *udev,
+                               struct uinput_request *request)
 {
         int retval;
 
-        retval = uinput_request_reserve_slot(udev, request);
-        if (retval)
-                return retval;
-
         retval = mutex_lock_interruptible(&udev->mutex);
         if (retval)
                 return retval;
@@ -118,7 +120,12 @@ static int uinput_request_submit(struct uinput_device *udev, struct uinput_reque
                 goto out;
         }
 
-        /* Tell our userspace app about this new request by queueing an input event */
+        init_completion(&request->done);
+
+        /*
+         * Tell our userspace application about this new request
+         * by queueing an input event.
+         */
         uinput_dev_event(udev->dev, EV_UINPUT, request->code, request->id);
 
  out:
@@ -126,8 +133,27 @@ static int uinput_request_submit(struct uinput_device *udev, struct uinput_reque
         return retval;
 }
 
+static int uinput_request_submit(struct uinput_device *udev,
+                                 struct uinput_request *request)
+{
+        int error;
+
+        error = uinput_request_reserve_slot(udev, request);
+        if (error)
+                return error;
+
+        error = uinput_request_send(udev, request);
+        if (error) {
+                uinput_request_done(udev, request);
+                return error;
+        }
+
+        wait_for_completion(&request->done);
+        return request->retval;
+}
+
 /*
- * Fail all ouitstanding requests so handlers don't wait for the userspace
+ * Fail all outstanding requests so handlers don't wait for the userspace
  * to finish processing them.
  */
 static void uinput_flush_requests(struct uinput_device *udev)
@@ -163,11 +189,12 @@ static int uinput_dev_playback(struct input_dev *dev, int effect_id, int value)
         return uinput_dev_event(dev, EV_FF, effect_id, value);
 }
 
-static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *effect, struct ff_effect *old)
+static int uinput_dev_upload_effect(struct input_dev *dev,
+                                    struct ff_effect *effect,
+                                    struct ff_effect *old)
 {
         struct uinput_device *udev = input_get_drvdata(dev);
         struct uinput_request request;
-        int retval;
 
         /*
          * uinput driver does not currently support periodic effects with
@@ -180,42 +207,25 @@ static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *eff
                         effect->u.periodic.waveform == FF_CUSTOM)
                 return -EINVAL;
 
-        request.id = -1;
-        init_completion(&request.done);
         request.code = UI_FF_UPLOAD;
         request.u.upload.effect = effect;
         request.u.upload.old = old;
 
-        retval = uinput_request_submit(udev, &request);
-        if (!retval) {
-                wait_for_completion(&request.done);
-                retval = request.retval;
-        }
-
-        return retval;
+        return uinput_request_submit(udev, &request);
 }
 
 static int uinput_dev_erase_effect(struct input_dev *dev, int effect_id)
 {
         struct uinput_device *udev = input_get_drvdata(dev);
         struct uinput_request request;
-        int retval;
 
         if (!test_bit(EV_FF, dev->evbit))
                 return -ENOSYS;
 
-        request.id = -1;
-        init_completion(&request.done);
         request.code = UI_FF_ERASE;
         request.u.effect_id = effect_id;
 
-        retval = uinput_request_submit(udev, &request);
-        if (!retval) {
-                wait_for_completion(&request.done);
-                retval = request.retval;
-        }
-
-        return retval;
+        return uinput_request_submit(udev, &request);
 }
 
 static void uinput_destroy_device(struct uinput_device *udev)
@@ -347,7 +357,8 @@ static int uinput_allocate_device(struct uinput_device *udev)
         return 0;
 }
 
-static int uinput_setup_device(struct uinput_device *udev, const char __user *buffer, size_t count)
+static int uinput_setup_device(struct uinput_device *udev,
+                               const char __user *buffer, size_t count)
 {
         struct uinput_user_dev  *user_dev;
         struct input_dev        *dev;
@@ -419,7 +430,8 @@ static int uinput_setup_device(struct uinput_device *udev, const char __user *bu
         return retval;
 }
 
-static inline ssize_t uinput_inject_event(struct uinput_device *udev, const char __user *buffer, size_t count)
+static ssize_t uinput_inject_event(struct uinput_device *udev,
+                                   const char __user *buffer, size_t count)
 {
         struct input_event ev;
 
@@ -434,11 +446,15 @@ static inline ssize_t uinput_inject_event(struct uinput_device *udev, const char
         return input_event_size();
 }
 
-static ssize_t uinput_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
+static ssize_t uinput_write(struct file *file, const char __user *buffer,
+                            size_t count, loff_t *ppos)
 {
         struct uinput_device *udev = file->private_data;
         int retval;
 
+        if (count == 0)
+                return 0;
+
         retval = mutex_lock_interruptible(&udev->mutex);
         if (retval)
                 return retval;
@@ -452,42 +468,74 @@ static ssize_t uinput_write(struct file *file, const char __user *buffer, size_t
         return retval;
 }
 
-static ssize_t uinput_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
+static bool uinput_fetch_next_event(struct uinput_device *udev,
+                                    struct input_event *event)
 {
-        struct uinput_device *udev = file->private_data;
-        int retval = 0;
+        bool have_event;
 
-        if (udev->state != UIST_CREATED)
-                return -ENODEV;
+        spin_lock_irq(&udev->dev->event_lock);
 
-        if (udev->head == udev->tail && (file->f_flags & O_NONBLOCK))
-                return -EAGAIN;
+        have_event = udev->head != udev->tail;
+        if (have_event) {
+                *event = udev->buff[udev->tail];
+                udev->tail = (udev->tail + 1) % UINPUT_BUFFER_SIZE;
+        }
 
-        retval = wait_event_interruptible(udev->waitq,
-                        udev->head != udev->tail || udev->state != UIST_CREATED);
-        if (retval)
-                return retval;
+        spin_unlock_irq(&udev->dev->event_lock);
 
-        retval = mutex_lock_interruptible(&udev->mutex);
-        if (retval)
-                return retval;
+        return have_event;
+}
 
-        if (udev->state != UIST_CREATED) {
-                retval = -ENODEV;
-                goto out;
-        }
+static ssize_t uinput_events_to_user(struct uinput_device *udev,
+                                     char __user *buffer, size_t count)
+{
+        struct input_event event;
+        size_t read = 0;
 
-        while (udev->head != udev->tail && retval + input_event_size() <= count) {
-                if (input_event_to_user(buffer + retval, &udev->buff[udev->tail])) {
-                        retval = -EFAULT;
-                        goto out;
-                }
-                udev->tail = (udev->tail + 1) % UINPUT_BUFFER_SIZE;
-                retval += input_event_size();
+        while (read + input_event_size() <= count &&
+               uinput_fetch_next_event(udev, &event)) {
+
+                if (input_event_to_user(buffer + read, &event))
+                        return -EFAULT;
+
+                read += input_event_size();
         }
 
- out:
-        mutex_unlock(&udev->mutex);
+        return read;
+}
+
+static ssize_t uinput_read(struct file *file, char __user *buffer,
+                           size_t count, loff_t *ppos)
+{
+        struct uinput_device *udev = file->private_data;
+        ssize_t retval;
+
+        if (count != 0 && count < input_event_size())
+                return -EINVAL;
+
+        do {
+                retval = mutex_lock_interruptible(&udev->mutex);
+                if (retval)
+                        return retval;
+
+                if (udev->state != UIST_CREATED)
+                        retval = -ENODEV;
+                else if (udev->head == udev->tail &&
+                         (file->f_flags & O_NONBLOCK))
+                        retval = -EAGAIN;
+                else
+                        retval = uinput_events_to_user(udev, buffer, count);
+
+                mutex_unlock(&udev->mutex);
+
+                if (retval || count == 0)
+                        break;
+
+                if (!(file->f_flags & O_NONBLOCK))
+                        retval = wait_event_interruptible(udev->waitq,
+                                                  udev->head != udev->tail ||
+                                                  udev->state != UIST_CREATED);
+        } while (retval == 0);
 
         return retval;
 }
@@ -516,8 +564,8 @@ static int uinput_release(struct inode *inode, struct file *file)
 
 #ifdef CONFIG_COMPAT
 struct uinput_ff_upload_compat {
-        int                     request_id;
-        int                     retval;
+        __u32                   request_id;
+        __s32                   retval;
         struct ff_effect_compat effect;
         struct ff_effect_compat old;
 };
@@ -703,7 +751,8 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd,
                                 break;
 
                         req = uinput_request_find(udev, ff_up.request_id);
-                        if (!req || req->code != UI_FF_UPLOAD || !req->u.upload.effect) {
+                        if (!req || req->code != UI_FF_UPLOAD ||
+                            !req->u.upload.effect) {
                                 retval = -EINVAL;
                                 break;
                         }
@@ -786,7 +835,8 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 }
 
 #ifdef CONFIG_COMPAT
-static long uinput_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static long uinput_compat_ioctl(struct file *file,
+                                unsigned int cmd, unsigned long arg)
 {
         return uinput_ioctl_handler(file, cmd, arg, compat_ptr(arg));
 }
@@ -831,4 +881,3 @@ MODULE_VERSION("0.3");
 
 module_init(uinput_init);
 module_exit(uinput_exit);
-