2014-05-07 09:38:16

by Loic Poulain

Subject: [PATCHv2] rfkill-gpio: Use gpio cansleep version

If gpio controller requires waiting for read and write
GPIO values, then we have to use the gpio cansleep api.
Fix the rfkill_gpio_set_power which calls only the
nonsleep version (causing kernel warning).
There is no problem to use the cansleep version here
because we are not in IRQ handler or similar context
(cf rfkill_set_block).

Signed-off-by: Loic Poulain <[email protected]>
---
v2: use cansleep unconditionnaly

net/rfkill/rfkill-gpio.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index bd2a5b9..1cb42d0 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -47,17 +47,14 @@ static int rfkill_gpio_set_power(void *data, bool blocked)
{
struct rfkill_gpio_data *rfkill = data;

- if (blocked) {
- gpiod_set_value(rfkill->shutdown_gpio, 0);
- gpiod_set_value(rfkill->reset_gpio, 0);
- if (!IS_ERR(rfkill->clk) && rfkill->clk_enabled)
- clk_disable(rfkill->clk);
- } else {
- if (!IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
- clk_enable(rfkill->clk);
- gpiod_set_value(rfkill->reset_gpio, 1);
- gpiod_set_value(rfkill->shutdown_gpio, 1);
- }
+ if (!blocked && !IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
+ clk_enable(rfkill->clk);
+
+ gpiod_set_value_cansleep(rfkill->shutdown_gpio, !blocked);
+ gpiod_set_value_cansleep(rfkill->reset_gpio, !blocked);
+
+ if (blocked && !IS_ERR(rfkill->clk) && rfkill->clk_enabled)
+ clk_disable(rfkill->clk);

rfkill->clk_enabled = blocked;

--
1.8.3.2

2014-05-07 11:21:11

by Johannes Berg

Subject: Re: [PATCHv2] rfkill-gpio: Use gpio cansleep version

On Wed, 2014-05-07 at 11:38 +0200, Loic Poulain wrote:
> If gpio controller requires waiting for read and write
> GPIO values, then we have to use the gpio cansleep api.
> Fix the rfkill_gpio_set_power which calls only the
> nonsleep version (causing kernel warning).
> There is no problem to use the cansleep version here
> because we are not in IRQ handler or similar context
> (cf rfkill_set_block).

Applied.

johannes