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

Commit 5864470a authored by Mike Looijmans's avatar Mike Looijmans Committed by Felipe Balbi
Browse files

usb: phy-generic: Use gpiod_set_value_cansleep 



The nop_reset and shutdown methods are called in a context that can sleep,
so use gpiod_set_value_cansleep instead of gpiod_set_value.

If you've connected the reset line to a GPIO expander, you'd get a kernel
"slowpath" warning with gpiod_set_value.

Signed-off-by: default avatarMike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 3589cce2

drivers/usb/phy/phy-generic.c

+3 −3
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ static void nop_reset(struct usb_phy_generic *nop) 
	if (!nop->gpiod_reset)

		return;



	gpiod_set_value(nop->gpiod_reset, 1);

	gpiod_set_value_cansleep(nop->gpiod_reset, 1);

	usleep_range(10000, 20000);

	gpiod_set_value(nop->gpiod_reset, 0);

	gpiod_set_value_cansleep(nop->gpiod_reset, 0);

}



/* interface to regulator framework */
@@ -159,7 +159,7 @@ void usb_gen_phy_shutdown(struct usb_phy *phy) 
{

	struct usb_phy_generic *nop = dev_get_drvdata(phy->dev);



	gpiod_set_value(nop->gpiod_reset, 1);

	gpiod_set_value_cansleep(nop->gpiod_reset, 1);



	if (!IS_ERR(nop->clk))

		clk_disable_unprepare(nop->clk);