staging:iio:adc: Use kstrtol()/kstrtoul()

Replace deprecated strict_strtol()/strict_strtoul() with
kstrtol()/kstrtoul(). Add missing checks for conversion return codes.

Signed-off-by: Aida Mynzhasova <ai.c.c0der@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 504701940585e3f3f12cac3ced0cfa67858ccccd..3283e282953653eab17c098c8df6bcfe64f9d602 100644 (file)
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -326,7 +326,7 @@ static ssize_t ad7192_write_frequency(struct device *dev,
        unsigned long lval;
        int div, ret;
 
-       ret = strict_strtoul(buf, 10, &lval);
+       ret = kstrtoul(buf, 10, &lval);
        if (ret)
                return ret;
        if (lval == 0)

diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index 2fd6ee3c1902ad27bd63dbae1c8d711783256229..c19618bc37c4a004e21206e9ae55e5116ad4016e 100644 (file)
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -632,7 +632,7 @@ static ssize_t ad7280_write_channel_config(struct device *dev,
        long val;
        int ret;
 
-       ret = strict_strtol(buf, 10, &val);
+       ret = kstrtol(buf, 10, &val);
        if (ret)
                return ret;
 

diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
index d104b43784241f7931003978f35ccdcb01e88277..72868ceda360cdd969cae70ddc6b1e50b2b33bb6 100644 (file)
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606_core.c
@@ -125,9 +125,12 @@ static ssize_t ad7606_store_range(struct device *dev,
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ad7606_state *st = iio_priv(indio_dev);
        unsigned long lval;
+       int ret;
+
+       ret = kstrtoul(buf, 10, &lval);
+       if (ret)
+               return ret;
 
-       if (strict_strtoul(buf, 10, &lval))
-               return -EINVAL;
        if (!(lval == 5000 || lval == 10000)) {
                dev_err(dev, "range is not supported\n");
                return -EINVAL;
@@ -173,8 +176,9 @@ static ssize_t ad7606_store_oversampling_ratio(struct device *dev,
        unsigned long lval;
        int ret;
 
-       if (strict_strtoul(buf, 10, &lval))
-               return -EINVAL;
+       ret = kstrtoul(buf, 10, &lval);
+       if (ret)
+               return ret;
 
        ret = ad7606_oversampling_get_index(lval);
        if (ret < 0) {

diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index 928477146c2fc17bd70e3434739fbf37cb6b496c..8470036a3378cba40d787f1e45fcb0410bd5d676 100644 (file)
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -175,9 +175,9 @@ static ssize_t ad7816_store_channel(struct device *dev,
        unsigned long data;
        int ret;
 
-       ret = strict_strtoul(buf, 10, &data);
+       ret = kstrtoul(buf, 10, &data);
        if (ret)
-               return -EINVAL;
+               return ret;
 
        if (data > AD7816_CS_MAX && data != AD7816_CS_MASK) {
                dev_err(&chip->spi_dev->dev, "Invalid channel id %lu for %s.\n",
@@ -290,7 +290,9 @@ static inline ssize_t ad7816_set_oti(struct device *dev,
        u8 data;
        int ret;
 
-       ret = strict_strtol(buf, 10, &value);
+       ret = kstrtol(buf, 10, &value);
+       if (ret)
+               return ret;
 
        if (chip->channel_id > AD7816_CS_MAX) {
                dev_err(dev, "Invalid oti channel id %d.\n", chip->channel_id);

diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index 8dc97b36e05a7ab5506da9b2be2ffaf0019b4e6f..2b2049c8bc6ba969896168f6b22b58ed7336afcc 100644 (file)
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -226,7 +226,7 @@ static ssize_t ad799x_write_frequency(struct device *dev,
        int ret, i;
        u8 t;
 
-       ret = strict_strtol(buf, 10, &val);
+       ret = kstrtol(buf, 10, &val);
        if (ret)
                return ret;
 
@@ -337,7 +337,7 @@ static ssize_t ad799x_write_channel_config(struct device *dev,
        long val;
        int ret;
 
-       ret = strict_strtol(buf, 10, &val);
+       ret = kstrtol(buf, 10, &val);
        if (ret)
                return ret;