leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: wfx: use sleeping gpio accessors

Browse Source 
Driver calls GPIO get/set only from non-atomic context and so can use any
GPIOs.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/cb19e7c521712d5a166e0b7e9cac4450798fdce0.1581416843.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michał Mirosław 2020-02-11 11:35:03 +01:00 committed by Greg Kroah-Hartman
parent 7f70c919ff
commit 40a97d55a6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/wfx/bh.c
View File

@ -20,10 +20,10 @@ static void device_wakeup(struct wfx_dev *wdev)
{
if (!wdev->pdata.gpio_wakeup)
return;
if (gpiod_get_value(wdev->pdata.gpio_wakeup))
if (gpiod_get_value_cansleep(wdev->pdata.gpio_wakeup))
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 (!completion_done(&wdev->hif.ctrl_ready))
udelay(2000);
@ -45,7 +45,7 @@ static void device_release(struct wfx_dev *wdev)
if (!wdev->pdata.gpio_wakeup)
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)

4
drivers/staging/wfx/bus_spi.c
View File

@ -210,9 +210,9 @@ static int wfx_spi_probe(struct spi_device *func)
} else {
if (spi_get_device_id(func)->driver_data & WFX_RESET_INVERTED)
gpiod_toggle_active_low(bus->gpio_reset);
gpiod_set_value(bus->gpio_reset, 1);
gpiod_set_value_cansleep(bus->gpio_reset, 1);
udelay(100);
gpiod_set_value(bus->gpio_reset, 0);
gpiod_set_value_cansleep(bus->gpio_reset, 0);
udelay(2000);
}

2
drivers/staging/wfx/main.c
View File

@ -425,7 +425,7 @@ int wfx_probe(struct wfx_dev *wdev)
"enable 'quiescent' power mode with gpio %d and PDS file %s\n",
desc_to_gpio(wdev->pdata.gpio_wakeup),
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);
hif_set_operational_mode(wdev, HIF_OP_POWER_MODE_QUIESCENT);
} else {