From f86f83622fe2c45d75f83a7db8d170da55b5b476 Mon Sep 17 00:00:00 2001 From: Aida Mynzhasova Date: Tue, 7 May 2013 00:04:41 +0400 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/adc/ad7192.c | 2 +- drivers/staging/iio/adc/ad7280a.c | 2 +- drivers/staging/iio/adc/ad7606_core.c | 12 ++++++++---- drivers/staging/iio/adc/ad7816.c | 8 +++++--- drivers/staging/iio/adc/ad799x_core.c | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c index 5047019..3283e282 100644 --- 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 2fd6ee3..c19618b 100644 --- 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 d104b43..72868ce 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) { diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c index 9284771..8470036 100644 --- 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 8dc97b3..2b2049c 100644 --- 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; -- 2.7.4