leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Aida Mynzhasova 2013-05-07 00:04:41 +04:00 committed by Greg Kroah-Hartman
parent 0c474826cf
commit f86f83622f
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/iio/adc/ad7192.c
View File

@ -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)

2
drivers/staging/iio/adc/ad7280a.c
View File

@ -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;

12
drivers/staging/iio/adc/ad7606_core.c
View File

@ -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) {

8
drivers/staging/iio/adc/ad7816.c
View File

@ -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);

4
drivers/staging/iio/adc/ad799x_core.c
View File

@ -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;