bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: hci_qca: Fix confusing shutdown() and power_off() naming

Browse Source 
The function called qca_power_off() is actually the hci_dev shutdown
handler, rename it to qca_hci_shutdown() to make this clear.

While the qca_power_shutdown() function is actually the counter-part
of qca_power_on() rename it to qca_power_off() to make this clear.

Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Hans de Goede
2026-02-12 15:17:20 +01:00
committed by Luiz Augusto von Dentz
parent 04c217a7fc
commit 7e2e1e5859
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/bluetooth/hci_qca.c
View File

@@ -236,8 +236,7 @@ struct qca_serdev {
static int qca_regulator_enable(struct qca_serdev *qcadev);
static void qca_regulator_disable(struct qca_serdev *qcadev);
static void qca_power_shutdown(struct hci_uart *hu);
static int qca_power_off(struct hci_dev *hdev);
static void qca_power_off(struct hci_uart *hu);
static void qca_controller_memdump(struct work_struct *work);
static void qca_dmp_hdr(struct hci_dev *hdev, struct sk_buff *skb);
@@ -2047,7 +2046,7 @@ retry:
out:
if (ret) {
qca_power_shutdown(hu);
qca_power_off(hu);
if (retries < MAX_INIT_RETRIES) {
bt_dev_warn(hdev, "Retry BT power ON:%d", retries);
@@ -2211,7 +2210,7 @@ static const struct qca_device_data qca_soc_data_wcn7850 __maybe_unused = {
QCA_CAP_HFP_HW_OFFLOAD,
};
static void qca_power_shutdown(struct hci_uart *hu)
static void qca_power_off(struct hci_uart *hu)
{
struct qca_serdev *qcadev;
struct qca_data *qca = hu->priv;
@@ -2272,7 +2271,7 @@ static void qca_power_shutdown(struct hci_uart *hu)
set_bit(QCA_BT_OFF, &qca->flags);
}
static int qca_power_off(struct hci_dev *hdev)
static int qca_hci_shutdown(struct hci_dev *hdev)
{
struct hci_uart *hu = hci_get_drvdata(hdev);
struct qca_data *qca = hu->priv;
@@ -2291,7 +2290,7 @@ static int qca_power_off(struct hci_dev *hdev)
usleep_range(8000, 10000);
}
qca_power_shutdown(hu);
qca_power_off(hu);
return 0;
}
@@ -2530,7 +2529,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
if (power_ctrl_enabled) {
hci_set_quirk(hdev, HCI_QUIRK_NON_PERSISTENT_SETUP);
hdev->shutdown = qca_power_off;
hdev->shutdown = qca_hci_shutdown;
}
if (data) {
@@ -2565,7 +2564,7 @@ static void qca_serdev_remove(struct serdev_device *serdev)
case QCA_WCN6855:
case QCA_WCN7850:
if (power->vregs_on)
qca_power_shutdown(&qcadev->serdev_hu);
qca_power_off(&qcadev->serdev_hu);
break;
default:
break;