From f3d63f50c17af70b4aa7d25a9c359ca318365173 Mon Sep 17 00:00:00 2001
From: Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org>
Date: Wed, 5 Feb 2020 16:21:43 +0530
Subject: [PATCH] Bluetooth: hci_qca: Optimized code while enabling clocks for BT SOC
Git-commit: f3d63f50c17af70b4aa7d25a9c359ca318365173
Patch-mainline: v5.7-rc1
References: jsc#SLE-13430
* Directly passing clock pointer to clock code without checking for NULL
as clock code takes care of it
* Removed the comment which was not necessary
* Updated code for return in qca_regulator_enable()
Signed-off-by: Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/bluetooth/hci_qca.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index eacc65b02b30..8e95bfe750d4 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1756,13 +1756,10 @@ static int qca_regulator_enable(struct qca_serdev *qcadev)
power->vregs_on = true;
ret = clk_prepare_enable(qcadev->susclk);
- if (ret) {
- /* Turn off regulators to overcome power leakage */
+ if (ret)
qca_regulator_disable(qcadev);
- return ret;
- }
- return 0;
+ return ret;
}
static void qca_regulator_disable(struct qca_serdev *qcadev)
@@ -1781,8 +1778,7 @@ static void qca_regulator_disable(struct qca_serdev *qcadev)
regulator_bulk_disable(power->num_vregs, power->vreg_bulk);
power->vregs_on = false;
- if (qcadev->susclk)
- clk_disable_unprepare(qcadev->susclk);
+ clk_disable_unprepare(qcadev->susclk);
}
static int qca_init_regulators(struct qca_power *qca,
--
2.16.4