From: Mike Looijmans Date: Tue, 13 Mar 2018 08:54:03 +0000 (+0100) Subject: clk: clk-gpio: Allow GPIO to sleep in set/get_parent X-Git-Tag: v4.17-rc1~18^2~5^6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e838e7f3a8979f9f323214dccb9263fde526b11;p=thirdparty%2Fkernel%2Flinux.git clk: clk-gpio: Allow GPIO to sleep in set/get_parent When changing or retrieving clock parents, the caller is in a sleepable state (like prepare) so the GPIO operation need not be atomic. Replace gpiod_{g|s}et_value with gpiod_{g|s}et_value_cansleep in the {g|s}et_parent calls for the GPIO based clock mux. This fixes a "slowpath" warning when the GPIO controller is an I2C expander or something similar. Signed-off-by: Mike Looijmans Signed-off-by: Stephen Boyd --- diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c index 151513c655c3c..40af4fbab4d23 100644 --- a/drivers/clk/clk-gpio.c +++ b/drivers/clk/clk-gpio.c @@ -73,14 +73,14 @@ static u8 clk_gpio_mux_get_parent(struct clk_hw *hw) { struct clk_gpio *clk = to_clk_gpio(hw); - return gpiod_get_value(clk->gpiod); + return gpiod_get_value_cansleep(clk->gpiod); } static int clk_gpio_mux_set_parent(struct clk_hw *hw, u8 index) { struct clk_gpio *clk = to_clk_gpio(hw); - gpiod_set_value(clk->gpiod, index); + gpiod_set_value_cansleep(clk->gpiod, index); return 0; }