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: 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>

diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c
index 983c41d1fe7cb86689aff546c60dcb9ff85418f8..c6319ab7e71aa1c76da666af86b8e8ca8a67348d 100644 (file)
--- a/drivers/staging/wfx/bh.c
+++ b/drivers/staging/wfx/bh.c
@@ -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)

diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c
index d6a75bd615951f04ca72c6a463c082e8376226ab..e3cd12592662ed71f367ed6da77944d0a198926b 100644 (file)
--- a/drivers/staging/wfx/bus_spi.c
+++ b/drivers/staging/wfx/bus_spi.c
@@ -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);
        }
 

diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c
index 76b2ff7fc7fe66828120ce03a54206e4a3099211..3c4c240229ad39b28c04cb0fde747df57790e803 100644 (file)
--- a/drivers/staging/wfx/main.c
+++ b/drivers/staging/wfx/main.c
@@ -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 {