diff options
author | Krystian Garbaciak <krystian.garbaciak@diasemi.com> | 2012-07-12 08:53:35 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-12 13:19:24 -0400 |
commit | 1beaf762b4ad5f53876f790bb6cfbd3bac072985 (patch) | |
tree | e8b47e3f8fde22e6558f570f3c1141b9d61074a1 | |
parent | 03ffcf3d0838bd5e693cd4520becfb22577cf34d (diff) |
regulator: Add REGULATOR_STATUS_UNDEFINED.
REGULATOR_STATUS_UNDEFINED is to be returned by regulator, if any other state
doesn't really apply.
Signed-off-by: Krystian Garbaciak <krystian.garbaciak@diasemi.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | drivers/regulator/core.c | 5 | ||||
-rw-r--r-- | include/linux/regulator/driver.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 4b136f8cb99f..01a67c50c4ea 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -393,6 +393,9 @@ static ssize_t regulator_status_show(struct device *dev, | |||
393 | case REGULATOR_STATUS_STANDBY: | 393 | case REGULATOR_STATUS_STANDBY: |
394 | label = "standby"; | 394 | label = "standby"; |
395 | break; | 395 | break; |
396 | case REGULATOR_STATUS_UNDEFINED: | ||
397 | label = "undefined"; | ||
398 | break; | ||
396 | default: | 399 | default: |
397 | return -ERANGE; | 400 | return -ERANGE; |
398 | } | 401 | } |
@@ -2897,7 +2900,7 @@ int regulator_mode_to_status(unsigned int mode) | |||
2897 | case REGULATOR_MODE_STANDBY: | 2900 | case REGULATOR_MODE_STANDBY: |
2898 | return REGULATOR_STATUS_STANDBY; | 2901 | return REGULATOR_STATUS_STANDBY; |
2899 | default: | 2902 | default: |
2900 | return 0; | 2903 | return REGULATOR_STATUS_UNDEFINED; |
2901 | } | 2904 | } |
2902 | } | 2905 | } |
2903 | EXPORT_SYMBOL_GPL(regulator_mode_to_status); | 2906 | EXPORT_SYMBOL_GPL(regulator_mode_to_status); |
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 80226383e561..2513a54ca2e8 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h | |||
@@ -32,6 +32,8 @@ enum regulator_status { | |||
32 | REGULATOR_STATUS_NORMAL, | 32 | REGULATOR_STATUS_NORMAL, |
33 | REGULATOR_STATUS_IDLE, | 33 | REGULATOR_STATUS_IDLE, |
34 | REGULATOR_STATUS_STANDBY, | 34 | REGULATOR_STATUS_STANDBY, |
35 | /* in case that any other status doesn't apply */ | ||
36 | REGULATOR_STATUS_UNDEFINED, | ||
35 | }; | 37 | }; |
36 | 38 | ||
37 | /** | 39 | /** |