Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 771bb3dd authored by Loic Poulain's avatar Loic Poulain Committed by Johannes Berg
Browse files

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: default avatarLoic Poulain <loic.poulain@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e5593f56

net/rfkill/rfkill-gpio.c

+8 −11
Original line number Diff line number Diff line
@@ -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)

	if (!blocked && !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);

	}



	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;