There were calls to "strict_strtol", which is marked as obsolete, so I replaced them with "kstrtol" as is suggested by scripts/checkpatch.pl.
Signed-off-by: Andreas Ruprecht <[email protected]> --- [v2] : small amendments to the original patch, made to gain profit from the kstrto* functions. - The values inside the *write_frequency functions were changed to unsigned long, as we probably won't have negative frequencies. - The variable val inside ad799x_write_channel_config was changed to be a u16 as it's only written out as a u16 here. --- drivers/staging/iio/adc/ad7280a.c | 2 +- drivers/staging/iio/adc/ad7793.c | 4 ++-- drivers/staging/iio/adc/ad7816.c | 2 +- drivers/staging/iio/adc/ad799x_core.c | 8 ++++---- drivers/staging/iio/adc/adt7310.c | 8 ++++---- drivers/staging/iio/adc/adt7410.c | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c index 319b1c6..e754465 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/ad7793.c b/drivers/staging/iio/adc/ad7793.c index 999f8f7..0d6f29c 100644 --- a/drivers/staging/iio/adc/ad7793.c +++ b/drivers/staging/iio/adc/ad7793.c @@ -567,7 +567,7 @@ static ssize_t ad7793_write_frequency(struct device *dev, { struct iio_dev *indio_dev = dev_get_drvdata(dev); struct ad7793_state *st = iio_priv(indio_dev); - long lval; + unsigned long lval; int i, ret; mutex_lock(&indio_dev->mlock); @@ -577,7 +577,7 @@ static ssize_t ad7793_write_frequency(struct device *dev, } mutex_unlock(&indio_dev->mlock); - ret = strict_strtol(buf, 10, &lval); + ret = kstrtol(buf, 10, &lval); if (ret) return ret; diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c index 57c9245..1a6313d 100644 --- a/drivers/staging/iio/adc/ad7816.c +++ b/drivers/staging/iio/adc/ad7816.c @@ -289,7 +289,7 @@ 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 (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 ee6cd79..6eb5d18 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c @@ -204,11 +204,11 @@ static ssize_t ad799x_write_frequency(struct device *dev, struct iio_dev *indio_dev = dev_get_drvdata(dev); struct ad799x_state *st = iio_priv(indio_dev); - long val; + unsigned long val; int ret, i; u8 t; - ret = strict_strtol(buf, 10, &val); + ret = kstrtol(buf, 10, &val); if (ret) return ret; @@ -316,10 +316,10 @@ static ssize_t ad799x_write_channel_config(struct device *dev, struct ad799x_state *st = iio_priv(indio_dev); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); - long val; + u16 val; int ret; - ret = strict_strtol(buf, 10, &val); + ret = kstrtou16(buf, 10, &val); if (ret) return ret; diff --git a/drivers/staging/iio/adc/adt7310.c b/drivers/staging/iio/adc/adt7310.c index 5c188ad..e868016 100644 --- a/drivers/staging/iio/adc/adt7310.c +++ b/drivers/staging/iio/adc/adt7310.c @@ -549,7 +549,7 @@ static inline ssize_t adt7310_set_t_bound(struct device *dev, pos = strchr(buf, '.'); - ret = strict_strtol(buf, 10, &tmp1); + ret = kstrtol(buf, 10, &tmp1); if (ret || tmp1 > 127 || tmp1 < -128) return -EINVAL; @@ -561,7 +561,7 @@ static inline ssize_t adt7310_set_t_bound(struct device *dev, if (len > ADT7310_T16_VALUE_FLOAT_OFFSET) len = ADT7310_T16_VALUE_FLOAT_OFFSET; pos[len] = 0; - ret = strict_strtol(pos, 10, &tmp2); + ret = kstrtol(pos, 10, &tmp2); if (!ret) tmp2 = (tmp2 / 78125) * 78125; @@ -569,7 +569,7 @@ static inline ssize_t adt7310_set_t_bound(struct device *dev, if (len > ADT7310_T13_VALUE_FLOAT_OFFSET) len = ADT7310_T13_VALUE_FLOAT_OFFSET; pos[len] = 0; - ret = strict_strtol(pos, 10, &tmp2); + ret = kstrtol(pos, 10, &tmp2); if (!ret) tmp2 = (tmp2 / 625) * 625; @@ -683,7 +683,7 @@ static inline ssize_t adt7310_set_t_hyst(struct device *dev, unsigned long data; u8 t_hyst; - ret = strict_strtol(buf, 10, &data); + ret = kstrtol(buf, 10, &data); if (ret || data > ADT7310_T_HYST_MASK) return -EINVAL; diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c index 89de487..f453c13 100644 --- a/drivers/staging/iio/adc/adt7410.c +++ b/drivers/staging/iio/adc/adt7410.c @@ -516,7 +516,7 @@ static inline ssize_t adt7410_set_t_bound(struct device *dev, pos = strchr(buf, '.'); - ret = strict_strtol(buf, 10, &tmp1); + ret = kstrtol(buf, 10, &tmp1); if (ret || tmp1 > 127 || tmp1 < -128) return -EINVAL; @@ -528,7 +528,7 @@ static inline ssize_t adt7410_set_t_bound(struct device *dev, if (len > ADT7410_T16_VALUE_FLOAT_OFFSET) len = ADT7410_T16_VALUE_FLOAT_OFFSET; pos[len] = 0; - ret = strict_strtol(pos, 10, &tmp2); + ret = kstrtol(pos, 10, &tmp2); if (!ret) tmp2 = (tmp2 / 78125) * 78125; @@ -536,7 +536,7 @@ static inline ssize_t adt7410_set_t_bound(struct device *dev, if (len > ADT7410_T13_VALUE_FLOAT_OFFSET) len = ADT7410_T13_VALUE_FLOAT_OFFSET; pos[len] = 0; - ret = strict_strtol(pos, 10, &tmp2); + ret = kstrtol(pos, 10, &tmp2); if (!ret) tmp2 = (tmp2 / 625) * 625; @@ -650,7 +650,7 @@ static inline ssize_t adt7410_set_t_hyst(struct device *dev, unsigned long data; u8 t_hyst; - ret = strict_strtol(buf, 10, &data); + ret = kstrtol(buf, 10, &data); if (ret || data > ADT7410_T_HYST_MASK) return -EINVAL; -- 1.7.5.4 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
