Skip to contentSkip to conversation

Bluetooth: hci_qca:Removed the function qca_setup_clock()

PATCH In review Venkata Lakshmi Narayana Gubba 1 participant 2 messages Feb 3, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 Bluetooth: hci_qca:Removed the function qca_setup_clock()

For enabling and disabling clocks, directly called the functions clk_prepare_enable() and clk_disable_unprepare() respectively.

---
 drivers/bluetooth/hci_qca.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/bluetooth/hci_qca.c +2 -11
index 73706f3..eacc65b 100644
@@ -1738,15 +1738,6 @@ static int qca_power_off(struct hci_dev *hdev)
 	return 0;
 }
 
-static int qca_setup_clock(struct clk *clk, bool enable)
-{
-	if (enable)
-		return clk_prepare_enable(clk);
-
-	clk_disable_unprepare(clk);
-	return 0;
-}
-
 static int qca_regulator_enable(struct qca_serdev *qcadev)
 {
 	struct qca_power *power = qcadev->bt_power;
@@ -1764,7 +1755,7 @@ static int qca_regulator_enable(struct qca_serdev *qcadev)
 
 	power->vregs_on = true;
 
-	ret = qca_setup_clock(qcadev->susclk, true);
+	ret = clk_prepare_enable(qcadev->susclk);
 	if (ret) {
 		/* Turn off regulators to overcome power leakage */
 		qca_regulator_disable(qcadev);
@@ -1791,7 +1782,7 @@ static void qca_regulator_disable(struct qca_serdev *qcadev)
 	power->vregs_on = false;
 
 	if (qcadev->susclk)
-		qca_setup_clock(qcadev->susclk, false);
+		clk_disable_unprepare(qcadev->susclk);
 }
 
 static int qca_init_regulators(struct qca_power *qca,
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member 
of Code Aurora Forum, hosted by The Linux Foundation
#1 lore raw

Please discard this.I will be sending another patch set.

Regards,
Venkata.

Quoted 48 lines · Venkata Lakshmi Narayana Gubba

For enabling and disabling clocks, directly called the functions clk_prepare_enable() and clk_disable_unprepare() respectively.

---
 drivers/bluetooth/hci_qca.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/bluetooth/hci_qca.c +1 -10
index 73706f3..eacc65b 100644
@@ -1738,15 +1738,6 @@ static int qca_power_off(struct hci_dev *hdev)
 	return 0;
 }
 
-static int qca_setup_clock(struct clk *clk, bool enable)
-{
-	if (enable)
-		return clk_prepare_enable(clk);
-
-	clk_disable_unprepare(clk);
-	return 0;
-}
-
 static int qca_regulator_enable(struct qca_serdev *qcadev)
 {
 	struct qca_power *power = qcadev->bt_power;
@@ -1764,7 +1755,7 @@ static int qca_regulator_enable(struct qca_serdev 
 *qcadev)
 
 	power->vregs_on = true;
 
-	ret = qca_setup_clock(qcadev->susclk, true);
+	ret = clk_prepare_enable(qcadev->susclk);
 	if (ret) {
 		/* Turn off regulators to overcome power leakage */
drivers/bluetooth/hci_qca.c +1 -1
 		qca_regulator_disable(qcadev);
@@ -1791,7 +1782,7 @@ static void qca_regulator_disable(struct
 qca_serdev *qcadev)
 	power->vregs_on = false;
 
 	if (qcadev->susclk)
-		qca_setup_clock(qcadev->susclk, false);
+		clk_disable_unprepare(qcadev->susclk);
 }
 

static int qca_init_regulators(struct qca_power *qca,