Linux wireless drivers development
 help / color / mirror / Atom feed
* [PATCH] rfkill-gpio: Use gpio cansleep version
@ 2014-05-06 16:14 Loic Poulain
  2014-05-07  9:02 ` Johannes Berg
  0 siblings, 1 reply; 3+ messages in thread
From: Loic Poulain @ 2014-05-06 16:14 UTC (permalink / raw)
  To: johannes; +Cc: linux-wireless, Loic Poulain

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 <loic.poulain@intel.com>
---
 net/rfkill/rfkill-gpio.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index bd2a5b9..db6579d 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -47,16 +47,24 @@ static int rfkill_gpio_set_power(void *data, bool blocked)
 {
 	struct rfkill_gpio_data *rfkill = data;
 
+	if (!blocked) {
+		if (!IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
+			clk_enable(rfkill->clk);
+	}
+
+	if (gpiod_cansleep(rfkill->shutdown_gpio))
+		gpiod_set_value_cansleep(rfkill->shutdown_gpio, !blocked);
+	else
+		gpiod_set_value(rfkill->shutdown_gpio, !blocked);
+
+	if (gpiod_cansleep(rfkill->reset_gpio))
+		gpiod_set_value_cansleep(rfkill->reset_gpio, !blocked);
+	else
+		gpiod_set_value(rfkill->reset_gpio, !blocked);
+
 	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);
 	}
 
 	rfkill->clk_enabled = blocked;
-- 
1.8.3.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-05-07  9:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-06 16:14 [PATCH] rfkill-gpio: Use gpio cansleep version Loic Poulain
2014-05-07  9:02 ` Johannes Berg
2014-05-07  9:04   ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox