Commit 40a97d55 authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman

staging: wfx: use sleeping gpio accessors

Driver calls GPIO get/set only from non-atomic context and so can use any
GPIOs.
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/cb19e7c521712d5a166e0b7e9cac4450798fdce0.1581416843.git.mirq-linux@rere.qmqm.plSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f70c919
...@@ -20,10 +20,10 @@ static void device_wakeup(struct wfx_dev *wdev) ...@@ -20,10 +20,10 @@ static void device_wakeup(struct wfx_dev *wdev)
{ {
if (!wdev->pdata.gpio_wakeup) if (!wdev->pdata.gpio_wakeup)
return; return;
if (gpiod_get_value(wdev->pdata.gpio_wakeup)) if (gpiod_get_value_cansleep(wdev->pdata.gpio_wakeup))
return; return;
gpiod_set_value(wdev->pdata.gpio_wakeup, 1); gpiod_set_value_cansleep(wdev->pdata.gpio_wakeup, 1);
if (wfx_api_older_than(wdev, 1, 4)) { if (wfx_api_older_than(wdev, 1, 4)) {
if (!completion_done(&wdev->hif.ctrl_ready)) if (!completion_done(&wdev->hif.ctrl_ready))
udelay(2000); udelay(2000);
...@@ -45,7 +45,7 @@ static void device_release(struct wfx_dev *wdev) ...@@ -45,7 +45,7 @@ static void device_release(struct wfx_dev *wdev)
if (!wdev->pdata.gpio_wakeup) if (!wdev->pdata.gpio_wakeup)
return; return;
gpiod_set_value(wdev->pdata.gpio_wakeup, 0); gpiod_set_value_cansleep(wdev->pdata.gpio_wakeup, 0);
} }
static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf)
......
...@@ -210,9 +210,9 @@ static int wfx_spi_probe(struct spi_device *func) ...@@ -210,9 +210,9 @@ static int wfx_spi_probe(struct spi_device *func)
} else { } else {
if (spi_get_device_id(func)->driver_data & WFX_RESET_INVERTED) if (spi_get_device_id(func)->driver_data & WFX_RESET_INVERTED)
gpiod_toggle_active_low(bus->gpio_reset); gpiod_toggle_active_low(bus->gpio_reset);
gpiod_set_value(bus->gpio_reset, 1); gpiod_set_value_cansleep(bus->gpio_reset, 1);
udelay(100); udelay(100);
gpiod_set_value(bus->gpio_reset, 0); gpiod_set_value_cansleep(bus->gpio_reset, 0);
udelay(2000); udelay(2000);
} }
......
...@@ -425,7 +425,7 @@ int wfx_probe(struct wfx_dev *wdev) ...@@ -425,7 +425,7 @@ int wfx_probe(struct wfx_dev *wdev)
"enable 'quiescent' power mode with gpio %d and PDS file %s\n", "enable 'quiescent' power mode with gpio %d and PDS file %s\n",
desc_to_gpio(wdev->pdata.gpio_wakeup), desc_to_gpio(wdev->pdata.gpio_wakeup),
wdev->pdata.file_pds); wdev->pdata.file_pds);
gpiod_set_value(wdev->pdata.gpio_wakeup, 1); gpiod_set_value_cansleep(wdev->pdata.gpio_wakeup, 1);
control_reg_write(wdev, 0); control_reg_write(wdev, 0);
hif_set_operational_mode(wdev, HIF_OP_POWER_MODE_QUIESCENT); hif_set_operational_mode(wdev, HIF_OP_POWER_MODE_QUIESCENT);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment