diff options
| author | Mark Brown <broonie@kernel.org> | 2015-11-04 11:19:36 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-04 11:19:36 +0000 |
| commit | ce3c059731043f7945dcd80b816540dbd7f928bd (patch) | |
| tree | 791723164eee51139bf0cd7c7142caa0c203d644 /drivers/regulator | |
| parent | 6a13feb9c82803e2b815eca72fa7a9f5561d7861 (diff) | |
| parent | 7ebcf26c39205ca8d61c178dcd3f5be4f25b1309 (diff) | |
| download | blackbird-obmc-linux-ce3c059731043f7945dcd80b816540dbd7f928bd.tar.gz blackbird-obmc-linux-ce3c059731043f7945dcd80b816540dbd7f928bd.zip | |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 8a34f6acc801..455732c2e843 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -180,7 +180,7 @@ static int regulator_check_voltage(struct regulator_dev *rdev, return -ENODEV; } if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) { - rdev_err(rdev, "operation not allowed\n"); + rdev_err(rdev, "voltage operation not allowed\n"); return -EPERM; } @@ -240,7 +240,7 @@ static int regulator_check_current_limit(struct regulator_dev *rdev, return -ENODEV; } if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_CURRENT)) { - rdev_err(rdev, "operation not allowed\n"); + rdev_err(rdev, "current operation not allowed\n"); return -EPERM; } @@ -277,7 +277,7 @@ static int regulator_mode_constrain(struct regulator_dev *rdev, int *mode) return -ENODEV; } if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_MODE)) { - rdev_err(rdev, "operation not allowed\n"); + rdev_err(rdev, "mode operation not allowed\n"); return -EPERM; } @@ -301,7 +301,7 @@ static int regulator_check_drms(struct regulator_dev *rdev) return -ENODEV; } if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_DRMS)) { - rdev_dbg(rdev, "operation not allowed\n"); + rdev_dbg(rdev, "drms operation not allowed\n"); return -EPERM; } return 0; |
