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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)
  Input: tc3589x-keypad - add missing kerneldoc
  Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages
  Input: ucb1400_ts - convert to threaded IRQ
  Input: ucb1400_ts - drop inline annotations
  Input: usb1400_ts - add __devinit/__devexit section annotations
  Input: ucb1400_ts - set driver owner
  Input: ucb1400_ts - convert to use dev_pm_ops
  Input: psmouse - make sure we do not use stale methods
  Input: evdev - do not block waiting for an event if fd is nonblock
  Input: evdev - if no events and non-block, return EAGAIN not 0
  Input: evdev - only allow reading events if a full packet is present
  Input: add driver for pixcir i2c touchscreens
  Input: samsung-keypad - implement runtime power management support
  Input: tegra-kbc - report wakeup key for some platforms
  Input: tegra-kbc - add device tree bindings
  Input: add driver for AUO In-Cell touchscreens using pixcir ICs
  Input: mpu3050 - configure the sampling method
  Input: mpu3050 - ensure we enable interrupts
  Input: mpu3050 - add of_match table for device-tree probing
  Input: sentelic - document the latest hardware
  ...

Fix up fairly trivial conflicts (device tree matching conflicting with
some independent cleanups) in drivers/input/keyboard/samsung-keypad.c

1 files changed, 19 insertions, 15 deletions

diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index d5ef3debd045..205d16aab441 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1198,9 +1198,9 @@ static ssize_t
 store_tabletXtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        long x;
+        int x;
 
-        if (strict_strtol(buf, 10, &x)) {
+        if (kstrtoint(buf, 10, &x)) {
                 size_t len = buf[count - 1] == '\n' ? count - 1 : count;
 
                 if (strncmp(buf, "disable", len))
@@ -1240,9 +1240,9 @@ static ssize_t
 store_tabletYtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        long y;
+        int y;
 
-        if (strict_strtol(buf, 10, &y)) {
+        if (kstrtoint(buf, 10, &y)) {
                 size_t len = buf[count - 1] == '\n' ? count - 1 : count;
 
                 if (strncmp(buf, "disable", len))
@@ -1277,12 +1277,13 @@ static ssize_t
 store_tabletJitterDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        long j;
+        int err, j;
 
-        if (strict_strtol(buf, 10, &j))
-                return -EINVAL;
+        err = kstrtoint(buf, 10, &j);
+        if (err)
+                return err;
 
-        aiptek->newSetting.jitterDelay = (int)j;
+        aiptek->newSetting.jitterDelay = j;
         return count;
 }
 
@@ -1306,12 +1307,13 @@ static ssize_t
 store_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        long d;
+        int err, d;
 
-        if (strict_strtol(buf, 10, &d))
-                return -EINVAL;
+        err = kstrtoint(buf, 10, &d);
+        if (err)
+                return err;
 
-        aiptek->newSetting.programmableDelay = (int)d;
+        aiptek->newSetting.programmableDelay = d;
         return count;
 }
 
@@ -1557,11 +1559,13 @@ static ssize_t
 store_tabletWheel(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
-        long w;
+        int err, w;
 
-        if (strict_strtol(buf, 10, &w)) return -EINVAL;
+        err = kstrtoint(buf, 10, &w);
+        if (err)
+                return err;
 
-        aiptek->newSetting.wheel = (int)w;
+        aiptek->newSetting.wheel = w;
         return count;
 }