diff options
author | Aida Mynzhasova <ai.c.c0der@gmail.com> | 2013-05-07 00:04:41 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-13 13:45:46 -0700 |
commit | f86f83622fe2c45d75f83a7db8d170da55b5b476 (patch) | |
tree | fceee55a242046654c4b6412f87802ff200df2df /drivers/staging/iio/adc/ad7606_core.c | |
parent | 0c474826cfdd24226c63b8d012a51cb7d9c85a67 (diff) | |
download | linux-f86f83622fe2c45d75f83a7db8d170da55b5b476.tar.bz2 |
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>
Diffstat (limited to 'drivers/staging/iio/adc/ad7606_core.c')
-rw-r--r-- | drivers/staging/iio/adc/ad7606_core.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c index d104b4378424..72868ceda360 100644 --- 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) { |