Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200605184611.252218-1-mka@chromium.org> <20200605114552.3.Ib9b5e6e81ea31cdc964cd0562ef4985a6c6c5154@changeid>
In-Reply-To: <20200605114552.3.Ib9b5e6e81ea31cdc964cd0562ef4985a6c6c5154@changeid>
From:   Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Date:   Fri, 5 Jun 2020 13:46:11 -0700
Message-ID: <CANFp7mW1PJ0vdAveXcPdTe=LNnGmzJCkWwmwCfdcxmqYsDbxLA@mail.gmail.com>
Subject: Re: [PATCH 3/3] Bluetooth: hci_qca: Refactor error handling in qca_suspend()
To:     Matthias Kaehlcke <mka@chromium.org>
Cc:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        Bluez mailing list <linux-bluetooth@vger.kernel.org>,
        Rocky Liao <rjliao@codeaurora.org>,
        Zijun Hu <zijuhu@codeaurora.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Balakrishna Godavarthi <bgodavar@codeaurora.org>,
        Claire Chang <tientzu@chromium.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>

On Fri, Jun 5, 2020 at 11:46 AM Matthias Kaehlcke <mka@chromium.org> wrote:
>
> If waiting for IBS sleep times out jump to the error handler, this is
> easier to read than multiple 'if' branches and a fall through to the
> error handler.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> ---
>
>  drivers/bluetooth/hci_qca.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index 90ffd8ca1fb0d..cf76f128e9834 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -2109,18 +2109,16 @@ static int __maybe_unused qca_suspend(struct device *dev)
>         /* Wait for HCI_IBS_SLEEP_IND sent by device to indicate its Tx is going
>          * to sleep, so that the packet does not wake the system later.
>          */
> -
>         ret = wait_event_interruptible_timeout(qca->suspend_wait_q,
>                         qca->rx_ibs_state == HCI_IBS_RX_ASLEEP,
>                         msecs_to_jiffies(IBS_BTSOC_TX_IDLE_TIMEOUT_MS));
> -
> -       if (ret > 0) {
> -               qca_wq_serial_tx_clock_vote_off(&qca->ws_tx_vote_off);
> -               return 0;
> +       if (ret == 0) {
> +               ret = -ETIMEDOUT;
> +               goto error;
>         }
>
> -       if (ret == 0)
> -               ret = -ETIMEDOUT;
> +       qca_wq_serial_tx_clock_vote_off(&qca->ws_tx_vote_off);
> +       return 0;
>
>  error:
>         clear_bit(QCA_SUSPENDING, &qca->flags);
> --
> 2.27.0.278.ge193c7cf3a9-goog
>