diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-12-10 08:55:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 23:12:41 +0900 |
| commit | 3708903ee60b1b89cbeee00cbc76e9fdbcbbed2e (patch) | |
| tree | 88fc1702d7545db8aa84e6db2da5c166a599404e /drivers/regulator | |
| parent | ad0b8b9e82b63ad2cc5e6822448adc897f49a5c4 (diff) | |
| download | linux-3708903ee60b1b89cbeee00cbc76e9fdbcbbed2e.tar.gz linux-3708903ee60b1b89cbeee00cbc76e9fdbcbbed2e.tar.bz2 linux-3708903ee60b1b89cbeee00cbc76e9fdbcbbed2e.zip | |
regulator: gpio-regulator: gpio_set_value should use cansleep
If it's possible for gpio_set_value to sleep, we should be using
the *_cansleep call instead. This patch fixes multiple warnings
from gpiolib.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/gpio-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 84e585fca795..9f40b0df68cb 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c @@ -82,7 +82,7 @@ static int gpio_regulator_set_voltage(struct regulator_dev *dev, for (ptr = 0; ptr < data->nr_gpios; ptr++) { state = (target & (1 << ptr)) >> ptr; - gpio_set_value(data->gpios[ptr].gpio, state); + gpio_set_value_cansleep(data->gpios[ptr].gpio, state); } data->state = target; @@ -119,7 +119,7 @@ static int gpio_regulator_set_current_limit(struct regulator_dev *dev, for (ptr = 0; ptr < data->nr_gpios; ptr++) { state = (target & (1 << ptr)) >> ptr; - gpio_set_value(data->gpios[ptr].gpio, state); + gpio_set_value_cansleep(data->gpios[ptr].gpio, state); } data->state = target; |