Re: [[PATCH staging] 6/7] staging: wfx: use sleeping gpio accessors

[JÃrÃme Pouiller]

On Tuesday 11 February 2020 09:46:55 CET MichaÅ MirosÅaw wrote:
> Driver calls GPIO get/set only from non-atomic context and so can use any
> GPIOs.
> 
> Signed-off-by: MichaÅ MirosÅaw <mirq-linux@xxxxxxxxxxxx>
> ---
>  drivers/staging/wfx/bh.c      | 6 +++---
>  drivers/staging/wfx/bus_spi.c | 4 ++--
>  drivers/staging/wfx/main.c    | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c
> index 983c41d1fe7c..c6319ab7e71a 100644
> --- 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 c5f78161234d..634b4e5bb055 100644
> --- a/drivers/staging/wfx/bus_spi.c
> +++ b/drivers/staging/wfx/bus_spi.c
> @@ -208,9 +208,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 84adad64fc30..e8bdeb9aa3a9 100644
> --- a/drivers/staging/wfx/main.c
> +++ b/drivers/staging/wfx/main.c
> @@ -420,7 +420,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 {
> --
> 2.20.1
> 

Reviewed-by: JÃrÃme Pouiller <jerome.pouiller@xxxxxxxxxx>

-- 
JÃrÃme Pouiller