UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: hci_qca: Refactor error handling in qca_suspend() 

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>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Matthias Kaehlcke 2020-06-05 11:46:11 -07:00 committed by Marcel Holtmann
parent e2a119cd84
commit 4da385f742
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/bluetooth/hci_qca.c
View File

@ -2107,18 +2107,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);