2012-05-22 08:52:21

by Pritesh Raithatha

[permalink] [raw]
Subject: [PATCH] gpio-charger: use cansleep version of gpio_set_value

Context of gpio_charger_get_property is sleepable so we should
use gpio_set_value_cansleep instead of gpio_set_value.

It will remove WARN_ON incase of using gpio from i2c-to-gpio
expander like pca953x.

Signed-off-by: Pritesh Raithatha <[email protected]>
---
drivers/power/gpio-charger.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index 8672c91..cb2aa31 100644
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -54,7 +54,7 @@ static int gpio_charger_get_property(struct power_supply *psy,

switch (psp) {
case POWER_SUPPLY_PROP_ONLINE:
- val->intval = gpio_get_value(pdata->gpio);
+ val->intval = gpio_get_value_cansleep(pdata->gpio);
val->intval ^= pdata->gpio_active_low;
break;
default:
--
1.7.1


2012-05-22 10:27:33

by Lars-Peter Clausen

[permalink] [raw]
Subject: Re: [PATCH] gpio-charger: use cansleep version of gpio_set_value

On 05/22/2012 10:50 AM, Pritesh Raithatha wrote:
> Context of gpio_charger_get_property is sleepable so we should
> use gpio_set_value_cansleep instead of gpio_set_value.
>
> It will remove WARN_ON incase of using gpio from i2c-to-gpio
> expander like pca953x.
>
> Signed-off-by: Pritesh Raithatha <[email protected]>

Looks good,

Acked-by: Lars-Peter Clausen <[email protected]>

> ---
> drivers/power/gpio-charger.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
> index 8672c91..cb2aa31 100644
> --- a/drivers/power/gpio-charger.c
> +++ b/drivers/power/gpio-charger.c
> @@ -54,7 +54,7 @@ static int gpio_charger_get_property(struct power_supply *psy,
>
> switch (psp) {
> case POWER_SUPPLY_PROP_ONLINE:
> - val->intval = gpio_get_value(pdata->gpio);
> + val->intval = gpio_get_value_cansleep(pdata->gpio);
> val->intval ^= pdata->gpio_active_low;
> break;
> default:

2012-06-20 03:51:41

by Anton Vorontsov

[permalink] [raw]
Subject: Re: [PATCH] gpio-charger: use cansleep version of gpio_set_value

On Tue, May 22, 2012 at 12:30:31PM +0200, Lars-Peter Clausen wrote:
> On 05/22/2012 10:50 AM, Pritesh Raithatha wrote:
> > Context of gpio_charger_get_property is sleepable so we should
> > use gpio_set_value_cansleep instead of gpio_set_value.
> >
> > It will remove WARN_ON incase of using gpio from i2c-to-gpio
> > expander like pca953x.
> >
> > Signed-off-by: Pritesh Raithatha <[email protected]>
>
> Looks good,
>
> Acked-by: Lars-Peter Clausen <[email protected]>

Applied, thanks!

--
Anton Vorontsov
Email: [email protected]