[PATCH] Staging: iio/adc: Fixed more calls of obsolete strict_strtol

Jonathan Cameron jic23 at cam.ac.uk
Wed Nov 23 17:04:46 UTC 2011


I would like to take a closer look at these as I suspect many would benefit from shorter types now there are functions for them.

Jonathan 

Andreas Ruprecht <rupran at einserver.de> wrote:

>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 <rupran at einserver.de>
>---
> drivers/staging/iio/adc/ad7280a.c     |    2 +-
> drivers/staging/iio/adc/ad7793.c      |    2 +-
> drivers/staging/iio/adc/ad7816.c      |    2 +-
> drivers/staging/iio/adc/ad799x_core.c |    4 ++--
> drivers/staging/iio/adc/adt7310.c     |    8 ++++----
> drivers/staging/iio/adc/adt7410.c     |    8 ++++----
> 6 files changed, 13 insertions(+), 13 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..ac24c5b 100644
>--- a/drivers/staging/iio/adc/ad7793.c
>+++ b/drivers/staging/iio/adc/ad7793.c
>@@ -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..32052a6 100644
>--- a/drivers/staging/iio/adc/ad799x_core.c
>+++ b/drivers/staging/iio/adc/ad799x_core.c
>@@ -208,7 +208,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;
> 
>@@ -319,7 +319,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;
> 
>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

-- 
Sent from my Android phone 
with K-9 Mail. Please excuse my brevity.



More information about the devel mailing list