Input: convert obsolete strict_strtox to kstrtox

With commit 67d0a0754455f89ef3946946159d8ec9e45ce33a we mark strict_strtox
as obsolete. Convert all remaining such uses in drivers/input/.

Also change long to appropriate types, and return error conditions
from kstrtox separately, as Dmitry sugguests.

Signed-off-by: JJ Ding <dgdunix@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
index 0470dd46b566..1c5d521de600 100644
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
@@ -789,11 +789,14 @@ static ssize_t hgpk_set_powered(struct psmouse *psmouse, void *data,
                                 const char *buf, size_t count)
 {
         struct hgpk_data *priv = psmouse->private;
-        unsigned long value;
+        unsigned int value;
         int err;
 
-        err = strict_strtoul(buf, 10, &value);
-        if (err || value > 1)
+        err = kstrtouint(buf, 10, &value);
+        if (err)
+                return err;
+
+        if (value > 1)
                 return -EINVAL;
 
         if (value != priv->powered) {
@@ -881,11 +884,14 @@ static ssize_t hgpk_trigger_recal(struct psmouse *psmouse, void *data,
                                 const char *buf, size_t count)
 {
         struct hgpk_data *priv = psmouse->private;
-        unsigned long value;
+        unsigned int value;
         int err;
 
-        err = strict_strtoul(buf, 10, &value);
-        if (err || value != 1)
+        err = kstrtouint(buf, 10, &value);
+        if (err)
+                return err;
+
+        if (value != 1)
                 return -EINVAL;
 
         /*