[PATCH] mfd: replace strict_strtoul() with kstrtoul()

[PATCH] mfd: replace strict_strtoul() with kstrtoul()

[Jingoo Han]

The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/mfd/aat2870-core.c   |    2 +-
 drivers/mfd/ab3100-core.c    |    6 +++---
 drivers/mfd/ab8500-debugfs.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c
index dfdb0a2..5fd81b9 100644
--- a/drivers/mfd/aat2870-core.c
+++ b/drivers/mfd/aat2870-core.c
@@ -312,7 +312,7 @@ static ssize_t aat2870_reg_write_file(struct file *file,
 	while (*start == ' ')
 		start++;
 
-	if (strict_strtoul(start, 16, &val))
+	if (kstrtoul(start, 16, &val))
 		return -EINVAL;
 
 	ret = aat2870->write(aat2870, (u8)addr, (u8)val);
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index a9bb140..49cc17e 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -514,13 +514,13 @@ static ssize_t ab3100_get_set_reg(struct file *file,
 	/*
 	 * Advance pointer to end of string then terminate
 	 * the register string. This is needed to satisfy
-	 * the strict_strtoul() function.
+	 * the kstrtoul() function.
 	 */
 	while ((i < buf_size) && (buf[i] != ' '))
 		i++;
 	buf[i] = '\0';
 
-	err = strict_strtoul(&buf[regp], 16, &user_reg);
+	err = kstrtoul(&buf[regp], 16, &user_reg);
 	if (err)
 		return err;
 	if (user_reg > 0xff)
@@ -557,7 +557,7 @@ static ssize_t ab3100_get_set_reg(struct file *file,
 			i++;
 		buf[i] = '\0';
 
-		err = strict_strtoul(&buf[valp], 16, &user_value);
+		err = kstrtoul(&buf[valp], 16, &user_value);
 		if (err)
 			return err;
 		if (user_reg > 0xff)
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index 37b7ce4..11656c2 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -2757,7 +2757,7 @@ static ssize_t show_irq(struct device *dev,
 	unsigned int irq_index;
 	int err;
 
-	err = strict_strtoul(attr->attr.name, 0, &name);
+	err = kstrtoul(attr->attr.name, 0, &name);
 	if (err)
 		return err;
 
-- 
1.7.10.4

Re: [PATCH] mfd: replace strict_strtoul() with kstrtoul()

[Andy Shevchenko]

On Sat, Jun 1, 2013 at 10:13 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> The usage of strict_strtoul() is not preferred, because
> strict_strtoul() is obsolete. Thus, kstrtoul() should be
> used.

> --- a/drivers/mfd/aat2870-core.c
> +++ b/drivers/mfd/aat2870-core.c
> @@ -312,7 +312,7 @@ static ssize_t aat2870_reg_write_file(struct file *file,
>         while (*start == ' ')
>                 start++;
>
> -       if (strict_strtoul(start, 16, &val))
> +       if (kstrtoul(start, 16, &val))
>                 return -EINVAL;

ret = kstrtoul(...);
if (ret)
 return ret;

> --- a/drivers/mfd/ab3100-core.c
> +++ b/drivers/mfd/ab3100-core.c
> @@ -514,13 +514,13 @@ static ssize_t ab3100_get_set_reg(struct file *file,
>         /*
>          * Advance pointer to end of string then terminate
>          * the register string. This is needed to satisfy
> -        * the strict_strtoul() function.
> +        * the kstrtoul() function.
>          */
>         while ((i < buf_size) && (buf[i] != ' '))
>                 i++;
>         buf[i] = '\0';
>
> -       err = strict_strtoul(&buf[regp], 16, &user_reg);
> +       err = kstrtoul(&buf[regp], 16, &user_reg);
>         if (err)
>                 return err;
>         if (user_reg > 0xff)

user_reg couldn't be more than byte.
So, you may change its definition to u8 and use here kstrtou8() and
remove later check.

But on first glance on that function it could be optimized a lot
(there are so many custom stuff like skip_space() and like that).

> @@ -557,7 +557,7 @@ static ssize_t ab3100_get_set_reg(struct file *file,
>                         i++;
>                 buf[i] = '\0';
>
> -               err = strict_strtoul(&buf[valp], 16, &user_value);
> +               err = kstrtoul(&buf[valp], 16, &user_value);
>                 if (err)
>                         return err;
>                 if (user_reg > 0xff)

Same idea here.

--
With Best Regards,
Andy Shevchenko

Re: [PATCH] mfd: replace strict_strtoul() with kstrtoul()

[Jingoo Han]

On Sunday, June 02, 2013 7:51 PM, Andy Shevchenko wrote:
> On Sat, Jun 1, 2013 at 10:13 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> > The usage of strict_strtoul() is not preferred, because
> > strict_strtoul() is obsolete. Thus, kstrtoul() should be
> > used.
> 
> > --- a/drivers/mfd/aat2870-core.c
> > +++ b/drivers/mfd/aat2870-core.c
> > @@ -312,7 +312,7 @@ static ssize_t aat2870_reg_write_file(struct file *file,
> >         while (*start == ' ')
> >                 start++;
> >
> > -       if (strict_strtoul(start, 16, &val))
> > +       if (kstrtoul(start, 16, &val))
> >                 return -EINVAL;
> 
> ret = kstrtoul(...);
> if (ret)
>  return ret;
> 
> > --- a/drivers/mfd/ab3100-core.c
> > +++ b/drivers/mfd/ab3100-core.c
> > @@ -514,13 +514,13 @@ static ssize_t ab3100_get_set_reg(struct file *file,
> >         /*
> >          * Advance pointer to end of string then terminate
> >          * the register string. This is needed to satisfy
> > -        * the strict_strtoul() function.
> > +        * the kstrtoul() function.
> >          */
> >         while ((i < buf_size) && (buf[i] != ' '))
> >                 i++;
> >         buf[i] = '\0';
> >
> > -       err = strict_strtoul(&buf[regp], 16, &user_reg);
> > +       err = kstrtoul(&buf[regp], 16, &user_reg);
> >         if (err)
> >                 return err;
> >         if (user_reg > 0xff)
> 
> user_reg couldn't be more than byte.
> So, you may change its definition to u8 and use here kstrtou8() and
> remove later check.

OK, I will change kstrtoul() to kstrtou8().

Best regards,
Jingoo Han

> 
> But on first glance on that function it could be optimized a lot
> (there are so many custom stuff like skip_space() and like that).
> 
> > @@ -557,7 +557,7 @@ static ssize_t ab3100_get_set_reg(struct file *file,
> >                         i++;
> >                 buf[i] = '\0';
> >
> > -               err = strict_strtoul(&buf[valp], 16, &user_value);
> > +               err = kstrtoul(&buf[valp], 16, &user_value);
> >                 if (err)
> >                         return err;
> >                 if (user_reg > 0xff)
> 
> Same idea here.
> 
> --
> With Best Regards,
> Andy Shevchenko

[PATCH] mfd: replace strict_strtoul() with kstrtoul()

[Jingoo Han]

The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
Changes since v1:
- Used return code from kstrtoul().
- Changed the type of 'user_reg' from 'unsigned long' to 'u8'.
- Replaced kstrtoul() with kstrtou8() to handle u8 variable.

 drivers/mfd/aat2870-core.c   |    5 +++--
 drivers/mfd/ab3100-core.c    |   16 ++++++----------
 drivers/mfd/ab8500-debugfs.c |    2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c
index dfdb0a2..d4f5945 100644
--- a/drivers/mfd/aat2870-core.c
+++ b/drivers/mfd/aat2870-core.c
@@ -312,8 +312,9 @@ static ssize_t aat2870_reg_write_file(struct file *file,
 	while (*start == ' ')
 		start++;
 
-	if (strict_strtoul(start, 16, &val))
-		return -EINVAL;
+	ret = kstrtoul(start, 16, &val);
+	if (ret)
+		return ret;
 
 	ret = aat2870->write(aat2870, (u8)addr, (u8)val);
 	if (ret)
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index a9bb140..9cc1bd3 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -491,7 +491,7 @@ static ssize_t ab3100_get_set_reg(struct file *file,
 	char buf[32];
 	ssize_t buf_size;
 	int regp;
-	unsigned long user_reg;
+	u8 user_reg;
 	int err;
 	int i = 0;
 
@@ -514,22 +514,20 @@ static ssize_t ab3100_get_set_reg(struct file *file,
 	/*
 	 * Advance pointer to end of string then terminate
 	 * the register string. This is needed to satisfy
-	 * the strict_strtoul() function.
+	 * the kstrtou8() function.
 	 */
 	while ((i < buf_size) && (buf[i] != ' '))
 		i++;
 	buf[i] = '\0';
 
-	err = strict_strtoul(&buf[regp], 16, &user_reg);
+	err = kstrtou8(&buf[regp], 16, &user_reg);
 	if (err)
 		return err;
-	if (user_reg > 0xff)
-		return -EINVAL;
 
 	/* Either we read or we write a register here */
 	if (!priv->mode) {
 		/* Reading */
-		u8 reg = (u8) user_reg;
+		u8 reg = user_reg;
 		u8 regvalue;
 
 		ab3100_get_register_interruptible(ab3100, reg, &regvalue);
@@ -540,7 +538,7 @@ static ssize_t ab3100_get_set_reg(struct file *file,
 	} else {
 		int valp;
 		unsigned long user_value;
-		u8 reg = (u8) user_reg;
+		u8 reg = user_reg;
 		u8 value;
 		u8 regvalue;
 
@@ -557,11 +555,9 @@ static ssize_t ab3100_get_set_reg(struct file *file,
 			i++;
 		buf[i] = '\0';
 
-		err = strict_strtoul(&buf[valp], 16, &user_value);
+		err = kstrtoul(&buf[valp], 16, &user_value);
 		if (err)
 			return err;
-		if (user_reg > 0xff)
-			return -EINVAL;
 
 		value = (u8) user_value;
 		ab3100_set_register_interruptible(ab3100, reg, value);
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index 37b7ce4..11656c2 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -2757,7 +2757,7 @@ static ssize_t show_irq(struct device *dev,
 	unsigned int irq_index;
 	int err;
 
-	err = strict_strtoul(attr->attr.name, 0, &name);
+	err = kstrtoul(attr->attr.name, 0, &name);
 	if (err)
 		return err;
 
-- 
1.7.10.4