Merge commit 'v3.2-rc3' into next

[firefly-linux-kernel-4.4.55.git] / drivers / input / misc / adxl34x.c

diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
index 09244804fb97674adfd9d39b28fc94c05bf651a3..1cf72fe513e6934af7fb4ab0d5742c3155537146 100644 (file)
--- a/drivers/input/misc/adxl34x.c
+++ b/drivers/input/misc/adxl34x.c
@@ -452,10 +452,10 @@ static ssize_t adxl34x_disable_store(struct device *dev,
                                     const char *buf, size_t count)
 {
        struct adxl34x *ac = dev_get_drvdata(dev);
-       unsigned long val;
+       unsigned int val;
        int error;
 
-       error = strict_strtoul(buf, 10, &val);
+       error = kstrtouint(buf, 10, &val);
        if (error)
                return error;
 
@@ -541,10 +541,10 @@ static ssize_t adxl34x_rate_store(struct device *dev,
                                  const char *buf, size_t count)
 {
        struct adxl34x *ac = dev_get_drvdata(dev);
-       unsigned long val;
+       unsigned char val;
        int error;
 
-       error = strict_strtoul(buf, 10, &val);
+       error = kstrtou8(buf, 10, &val);
        if (error)
                return error;
 
@@ -576,10 +576,10 @@ static ssize_t adxl34x_autosleep_store(struct device *dev,
                                  const char *buf, size_t count)
 {
        struct adxl34x *ac = dev_get_drvdata(dev);
-       unsigned long val;
+       unsigned int val;
        int error;
 
-       error = strict_strtoul(buf, 10, &val);
+       error = kstrtouint(buf, 10, &val);
        if (error)
                return error;
 
@@ -623,13 +623,13 @@ static ssize_t adxl34x_write_store(struct device *dev,
                                   const char *buf, size_t count)
 {
        struct adxl34x *ac = dev_get_drvdata(dev);
-       unsigned long val;
+       unsigned int val;
        int error;
 
        /*
         * This allows basic ADXL register write access for debug purposes.
         */
-       error = strict_strtoul(buf, 16, &val);
+       error = kstrtouint(buf, 16, &val);
        if (error)
                return error;