2018-08-27 09:35:13

by Ding Xiang

[permalink] [raw]

Subject: [PATCH] power: supply: ab8500_fg: fix obsolete function

---

simple_strtoul is obsolete, and use kstrtoint instead

Signed-off-by: Ding Xiang <[email protected]>
---
drivers/power/supply/ab8500_fg.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c
index 02356f9..2bdadb5 100644
--- a/drivers/power/supply/ab8500_fg.c
+++ b/drivers/power/supply/ab8500_fg.c
@@ -2582,11 +2582,12 @@ static ssize_t ab8505_powercut_flagtime_write(struct device *dev,
const char *buf, size_t count)
{
int ret;
- long unsigned reg_value;
+ int reg_value;
struct power_supply *psy = dev_get_drvdata(dev);
struct ab8500_fg *di = power_supply_get_drvdata(psy);

- reg_value = simple_strtoul(buf, NULL, 10);
+ if (kstrtoint(buf, 10, &reg_value))
+ goto fail;

if (reg_value > 0x7F) {
dev_err(dev, "Incorrect parameter, echo 0 (1.98s) - 127 (15.625ms) for flagtime\n");
@@ -2636,7 +2637,9 @@ static ssize_t ab8505_powercut_maxtime_write(struct device *dev,
struct power_supply *psy = dev_get_drvdata(dev);
struct ab8500_fg *di = power_supply_get_drvdata(psy);

- reg_value = simple_strtoul(buf, NULL, 10);
+ if (kstrtoint(buf, 10, &reg_value))
+ goto fail;
+
if (reg_value > 0x7F) {
dev_err(dev, "Incorrect parameter, echo 0 (0.0s) - 127 (1.98s) for maxtime\n");
goto fail;
@@ -2684,7 +2687,9 @@ static ssize_t ab8505_powercut_restart_write(struct device *dev,
struct power_supply *psy = dev_get_drvdata(dev);
struct ab8500_fg *di = power_supply_get_drvdata(psy);

- reg_value = simple_strtoul(buf, NULL, 10);
+ if (kstrtoint(buf, 10, &reg_value))
+ goto fail;
+
if (reg_value > 0xF) {
dev_err(dev, "Incorrect parameter, echo 0 - 15 for number of restart\n");
goto fail;
@@ -2777,7 +2782,9 @@ static ssize_t ab8505_powercut_write(struct device *dev,
struct power_supply *psy = dev_get_drvdata(dev);
struct ab8500_fg *di = power_supply_get_drvdata(psy);

- reg_value = simple_strtoul(buf, NULL, 10);
+ if (kstrtoint(buf, 10, &reg_value))
+ goto fail;
+
if (reg_value > 0x1) {
dev_err(dev, "Incorrect parameter, echo 0/1 to disable/enable Pcut feature\n");
goto fail;
@@ -2849,7 +2856,9 @@ static ssize_t ab8505_powercut_debounce_write(struct device *dev,
struct power_supply *psy = dev_get_drvdata(dev);
struct ab8500_fg *di = power_supply_get_drvdata(psy);

- reg_value = simple_strtoul(buf, NULL, 10);
+ if (kstrtoint(buf, 10, &reg_value))
+ goto fail;
+
if (reg_value > 0x7) {
dev_err(dev, "Incorrect parameter, echo 0 to 7 for debounce setting\n");
goto fail;
--
1.8.3.1

2018-08-29 22:34:43

by Sebastian Reichel

[permalink] [raw]

Subject: Re: [PATCH] power: supply: ab8500_fg: fix obsolete function

---

Hi,

On Mon, Aug 27, 2018 at 06:49:15AM -0400, Ding Xiang wrote:
> simple_strtoul is obsolete, and use kstrtoint instead
>
> Signed-off-by: Ding Xiang <[email protected]>
> ---

Thanks, queued.

-- Sebastian

> drivers/power/supply/ab8500_fg.c | 21 +++++++++++++++------
> 1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c
> index 02356f9..2bdadb5 100644
> --- a/drivers/power/supply/ab8500_fg.c
> +++ b/drivers/power/supply/ab8500_fg.c
> @@ -2582,11 +2582,12 @@ static ssize_t ab8505_powercut_flagtime_write(struct device *dev,
> const char *buf, size_t count)
> {
> int ret;
> - long unsigned reg_value;
> + int reg_value;
> struct power_supply *psy = dev_get_drvdata(dev);
> struct ab8500_fg *di = power_supply_get_drvdata(psy);
>
> - reg_value = simple_strtoul(buf, NULL, 10);
> + if (kstrtoint(buf, 10, &reg_value))
> + goto fail;
>
> if (reg_value > 0x7F) {
> dev_err(dev, "Incorrect parameter, echo 0 (1.98s) - 127 (15.625ms) for flagtime\n");
> @@ -2636,7 +2637,9 @@ static ssize_t ab8505_powercut_maxtime_write(struct device *dev,
> struct power_supply *psy = dev_get_drvdata(dev);
> struct ab8500_fg *di = power_supply_get_drvdata(psy);
>
> - reg_value = simple_strtoul(buf, NULL, 10);
> + if (kstrtoint(buf, 10, &reg_value))
> + goto fail;
> +
> if (reg_value > 0x7F) {
> dev_err(dev, "Incorrect parameter, echo 0 (0.0s) - 127 (1.98s) for maxtime\n");
> goto fail;
> @@ -2684,7 +2687,9 @@ static ssize_t ab8505_powercut_restart_write(struct device *dev,
> struct power_supply *psy = dev_get_drvdata(dev);
> struct ab8500_fg *di = power_supply_get_drvdata(psy);
>
> - reg_value = simple_strtoul(buf, NULL, 10);
> + if (kstrtoint(buf, 10, &reg_value))
> + goto fail;
> +
> if (reg_value > 0xF) {
> dev_err(dev, "Incorrect parameter, echo 0 - 15 for number of restart\n");
> goto fail;
> @@ -2777,7 +2782,9 @@ static ssize_t ab8505_powercut_write(struct device *dev,
> struct power_supply *psy = dev_get_drvdata(dev);
> struct ab8500_fg *di = power_supply_get_drvdata(psy);
>
> - reg_value = simple_strtoul(buf, NULL, 10);
> + if (kstrtoint(buf, 10, &reg_value))
> + goto fail;
> +
> if (reg_value > 0x1) {
> dev_err(dev, "Incorrect parameter, echo 0/1 to disable/enable Pcut feature\n");
> goto fail;
> @@ -2849,7 +2856,9 @@ static ssize_t ab8505_powercut_debounce_write(struct device *dev,
> struct power_supply *psy = dev_get_drvdata(dev);
> struct ab8500_fg *di = power_supply_get_drvdata(psy);
>
> - reg_value = simple_strtoul(buf, NULL, 10);
> + if (kstrtoint(buf, 10, &reg_value))
> + goto fail;
> +
> if (reg_value > 0x7) {
> dev_err(dev, "Incorrect parameter, echo 0 to 7 for debounce setting\n");
> goto fail;
> --
> 1.8.3.1
>
>
>

---

Attachments:

(No filename) (2.85 kB)
signature.asc (849.00 B)
Download all attachments