diff options
| author | Krystian Garbaciak <krystian.garbaciak@diasemi.com> | 2012-07-12 13:53:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-12 18:19:24 +0100 |
| commit | 1beaf762b4ad5f53876f790bb6cfbd3bac072985 (patch) | |
| tree | e8b47e3f8fde22e6558f570f3c1141b9d61074a1 | |
| parent | 03ffcf3d0838bd5e693cd4520becfb22577cf34d (diff) | |
| download | op-kernel-dev-1beaf762b4ad5f53876f790bb6cfbd3bac072985.zip op-kernel-dev-1beaf762b4ad5f53876f790bb6cfbd3bac072985.tar.gz | |
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 4b136f8..01a67c5 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -393,6 +393,9 @@ static ssize_t regulator_status_show(struct device *dev, case REGULATOR_STATUS_STANDBY: label = "standby"; break; + case REGULATOR_STATUS_UNDEFINED: + label = "undefined"; + break; default: return -ERANGE; } @@ -2897,7 +2900,7 @@ int regulator_mode_to_status(unsigned int mode) case REGULATOR_MODE_STANDBY: return REGULATOR_STATUS_STANDBY; default: - return 0; + return REGULATOR_STATUS_UNDEFINED; } } EXPORT_SYMBOL_GPL(regulator_mode_to_status); diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 8022638..2513a54 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -32,6 +32,8 @@ enum regulator_status { REGULATOR_STATUS_NORMAL, REGULATOR_STATUS_IDLE, REGULATOR_STATUS_STANDBY, + /* in case that any other status doesn't apply */ + REGULATOR_STATUS_UNDEFINED, }; /** |
