diff options
author | Ding Xiang <dingxiang@cmss.chinamobile.com> | 2018-08-27 06:49:15 -0400 |
---|---|---|
committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2018-08-29 18:06:45 -0400 |
commit | b00b04aa668cc16ab67fe7ef553a7d14d4d16861 (patch) | |
tree | 28a213bad81f948ca2c8f91eed9daf5ba65e02cd | |
parent | 89a74789f4b476cda2c791ba26a1ade116218b15 (diff) |
power: supply: ab8500_fg: fix obsolete function
simple_strtoul is obsolete, and use kstrtoint instead
Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-rw-r--r-- | drivers/power/supply/ab8500_fg.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c index 02356f9b5f22..2bdadb58bcc6 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, | |||
2582 | const char *buf, size_t count) | 2582 | const char *buf, size_t count) |
2583 | { | 2583 | { |
2584 | int ret; | 2584 | int ret; |
2585 | long unsigned reg_value; | 2585 | int reg_value; |
2586 | struct power_supply *psy = dev_get_drvdata(dev); | 2586 | struct power_supply *psy = dev_get_drvdata(dev); |
2587 | struct ab8500_fg *di = power_supply_get_drvdata(psy); | 2587 | struct ab8500_fg *di = power_supply_get_drvdata(psy); |
2588 | 2588 | ||
2589 | reg_value = simple_strtoul(buf, NULL, 10); | 2589 | if (kstrtoint(buf, 10, ®_value)) |
2590 | goto fail; | ||
2590 | 2591 | ||
2591 | if (reg_value > 0x7F) { | 2592 | if (reg_value > 0x7F) { |
2592 | dev_err(dev, "Incorrect parameter, echo 0 (1.98s) - 127 (15.625ms) for flagtime\n"); | 2593 | 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, | |||
2636 | struct power_supply *psy = dev_get_drvdata(dev); | 2637 | struct power_supply *psy = dev_get_drvdata(dev); |
2637 | struct ab8500_fg *di = power_supply_get_drvdata(psy); | 2638 | struct ab8500_fg *di = power_supply_get_drvdata(psy); |
2638 | 2639 | ||
2639 | reg_value = simple_strtoul(buf, NULL, 10); | 2640 | if (kstrtoint(buf, 10, ®_value)) |
2641 | goto fail; | ||
2642 | |||
2640 | if (reg_value > 0x7F) { | 2643 | if (reg_value > 0x7F) { |
2641 | dev_err(dev, "Incorrect parameter, echo 0 (0.0s) - 127 (1.98s) for maxtime\n"); | 2644 | dev_err(dev, "Incorrect parameter, echo 0 (0.0s) - 127 (1.98s) for maxtime\n"); |
2642 | goto fail; | 2645 | goto fail; |
@@ -2684,7 +2687,9 @@ static ssize_t ab8505_powercut_restart_write(struct device *dev, | |||
2684 | struct power_supply *psy = dev_get_drvdata(dev); | 2687 | struct power_supply *psy = dev_get_drvdata(dev); |
2685 | struct ab8500_fg *di = power_supply_get_drvdata(psy); | 2688 | struct ab8500_fg *di = power_supply_get_drvdata(psy); |
2686 | 2689 | ||
2687 | reg_value = simple_strtoul(buf, NULL, 10); | 2690 | if (kstrtoint(buf, 10, ®_value)) |
2691 | goto fail; | ||
2692 | |||
2688 | if (reg_value > 0xF) { | 2693 | if (reg_value > 0xF) { |
2689 | dev_err(dev, "Incorrect parameter, echo 0 - 15 for number of restart\n"); | 2694 | dev_err(dev, "Incorrect parameter, echo 0 - 15 for number of restart\n"); |
2690 | goto fail; | 2695 | goto fail; |
@@ -2777,7 +2782,9 @@ static ssize_t ab8505_powercut_write(struct device *dev, | |||
2777 | struct power_supply *psy = dev_get_drvdata(dev); | 2782 | struct power_supply *psy = dev_get_drvdata(dev); |
2778 | struct ab8500_fg *di = power_supply_get_drvdata(psy); | 2783 | struct ab8500_fg *di = power_supply_get_drvdata(psy); |
2779 | 2784 | ||
2780 | reg_value = simple_strtoul(buf, NULL, 10); | 2785 | if (kstrtoint(buf, 10, ®_value)) |
2786 | goto fail; | ||
2787 | |||
2781 | if (reg_value > 0x1) { | 2788 | if (reg_value > 0x1) { |
2782 | dev_err(dev, "Incorrect parameter, echo 0/1 to disable/enable Pcut feature\n"); | 2789 | dev_err(dev, "Incorrect parameter, echo 0/1 to disable/enable Pcut feature\n"); |
2783 | goto fail; | 2790 | goto fail; |
@@ -2849,7 +2856,9 @@ static ssize_t ab8505_powercut_debounce_write(struct device *dev, | |||
2849 | struct power_supply *psy = dev_get_drvdata(dev); | 2856 | struct power_supply *psy = dev_get_drvdata(dev); |
2850 | struct ab8500_fg *di = power_supply_get_drvdata(psy); | 2857 | struct ab8500_fg *di = power_supply_get_drvdata(psy); |
2851 | 2858 | ||
2852 | reg_value = simple_strtoul(buf, NULL, 10); | 2859 | if (kstrtoint(buf, 10, ®_value)) |
2860 | goto fail; | ||
2861 | |||
2853 | if (reg_value > 0x7) { | 2862 | if (reg_value > 0x7) { |
2854 | dev_err(dev, "Incorrect parameter, echo 0 to 7 for debounce setting\n"); | 2863 | dev_err(dev, "Incorrect parameter, echo 0 to 7 for debounce setting\n"); |
2855 | goto fail; | 2864 | goto fail; |