2013-06-03 09:05:10

by Jingoo Han

Subject: [PATCH V2] power: replace strict_strtoul() with kstrtoul()

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

Signed-off-by: Jingoo Han <[email protected]>
---
Changes since v1:
- Used return code from kstrtoul().

drivers/power/ab8500_fg.c | 6 +++---
drivers/power/pcf50633-charger.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index c5391f5..308e511 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2465,9 +2465,9 @@ static ssize_t charge_full_store(struct ab8500_fg *di, const char *buf,
size_t count)
{
unsigned long charge_full;
- ssize_t ret = -EINVAL;
+ ssize_t ret;

- ret = strict_strtoul(buf, 10, &charge_full);
+ ret = kstrtoul(buf, 10, &charge_full);

dev_dbg(di->dev, "Ret %zd charge_full %lu", ret, charge_full);

@@ -2489,7 +2489,7 @@ static ssize_t charge_now_store(struct ab8500_fg *di, const char *buf,
unsigned long charge_now;
ssize_t ret;

- ret = strict_strtoul(buf, 10, &charge_now);
+ ret = kstrtoul(buf, 10, &charge_now);

dev_dbg(di->dev, "Ret %zd charge_now %lu was %d",
ret, charge_now, di->bat_cap.prev_mah);
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index 17fd77f..771c4f0 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -191,9 +191,9 @@ static ssize_t set_usblim(struct device *dev,
unsigned long ma;
int ret;

- ret = strict_strtoul(buf, 10, &ma);
+ ret = kstrtoul(buf, 10, &ma);
if (ret)
- return -EINVAL;
+ return ret;

pcf50633_mbc_usb_curlim_set(mbc->pcf, ma);

@@ -228,9 +228,9 @@ static ssize_t set_chglim(struct device *dev,
if (!mbc->pcf->pdata->charger_reference_current_ma)
return -ENODEV;

- ret = strict_strtoul(buf, 10, &ma);
+ ret = kstrtoul(buf, 10, &ma);
if (ret)
- return -EINVAL;
+ return ret;

mbcc5 = (ma << 8) / mbc->pcf->pdata->charger_reference_current_ma;
if (mbcc5 > 255)
--
1.7.10.4

2013-06-03 10:49:51

by Andy Shevchenko

Subject: Re: [PATCH V2] power: replace strict_strtoul() with kstrtoul()

On Mon, Jun 3, 2013 at 12:05 PM, Jingoo Han <[email protected]> wrote:
> The usage of strict_strtoul() is not preferred, because
> strict_strtoul() is obsolete. Thus, kstrtoul() should be
> used.
>
> Signed-off-by: Jingoo Han <[email protected]>

Looks better.
Reviewed-by: Andy Shevchenko <[email protected]>

> ---
> Changes since v1:
> - Used return code from kstrtoul().
>
> drivers/power/ab8500_fg.c | 6 +++---
> drivers/power/pcf50633-charger.c | 8 ++++----
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
> index c5391f5..308e511 100644
> --- a/drivers/power/ab8500_fg.c
> +++ b/drivers/power/ab8500_fg.c
> @@ -2465,9 +2465,9 @@ static ssize_t charge_full_store(struct ab8500_fg *di, const char *buf,
> size_t count)
> {
> unsigned long charge_full;
> - ssize_t ret = -EINVAL;
> + ssize_t ret;
>
> - ret = strict_strtoul(buf, 10, &charge_full);
> + ret = kstrtoul(buf, 10, &charge_full);
>
> dev_dbg(di->dev, "Ret %zd charge_full %lu", ret, charge_full);
>
> @@ -2489,7 +2489,7 @@ static ssize_t charge_now_store(struct ab8500_fg *di, const char *buf,
> unsigned long charge_now;
> ssize_t ret;
>
> - ret = strict_strtoul(buf, 10, &charge_now);
> + ret = kstrtoul(buf, 10, &charge_now);
>
> dev_dbg(di->dev, "Ret %zd charge_now %lu was %d",
> ret, charge_now, di->bat_cap.prev_mah);
> diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
> index 17fd77f..771c4f0 100644
> --- a/drivers/power/pcf50633-charger.c
> +++ b/drivers/power/pcf50633-charger.c
> @@ -191,9 +191,9 @@ static ssize_t set_usblim(struct device *dev,
> unsigned long ma;
> int ret;
>
> - ret = strict_strtoul(buf, 10, &ma);
> + ret = kstrtoul(buf, 10, &ma);
> if (ret)
> - return -EINVAL;
> + return ret;
>
> pcf50633_mbc_usb_curlim_set(mbc->pcf, ma);
>
> @@ -228,9 +228,9 @@ static ssize_t set_chglim(struct device *dev,
> if (!mbc->pcf->pdata->charger_reference_current_ma)
> return -ENODEV;
>
> - ret = strict_strtoul(buf, 10, &ma);
> + ret = kstrtoul(buf, 10, &ma);
> if (ret)
> - return -EINVAL;
> + return ret;
>
> mbcc5 = (ma << 8) / mbc->pcf->pdata->charger_reference_current_ma;
> if (mbcc5 > 255)
> --
> 1.7.10.4
>
>



--
With Best Regards,
Andy Shevchenko

2013-06-07 00:40:47

by Anton Vorontsov

Subject: Re: [PATCH V2] power: replace strict_strtoul() with kstrtoul()

On Mon, Jun 03, 2013 at 01:49:49PM +0300, Andy Shevchenko wrote:
> On Mon, Jun 3, 2013 at 12:05 PM, Jingoo Han <[email protected]> wrote:
> > The usage of strict_strtoul() is not preferred, because
> > strict_strtoul() is obsolete. Thus, kstrtoul() should be
> > used.
> >
> > Signed-off-by: Jingoo Han <[email protected]>
>
> Looks better.
> Reviewed-by: Andy Shevchenko <[email protected]>

Applied, thanks a lot!

Anton