From: Lee Jones Date: Mon, 10 Dec 2012 08:55:53 +0000 (+0000) Subject: regulator: gpio-regulator: gpio_set_value should use cansleep X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3708903ee60b1b89cbeee00cbc76e9fdbcbbed2e;p=linux.git 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 Signed-off-by: Lee Jones Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 84e585fca7952..9f40b0df68cb1 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;