tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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>

authored by

Hans de Goede and committed by
Luiz Augusto von Dentz 7e2e1e58 04c217a7

+7 -8
+7 -8
drivers/bluetooth/hci_qca.c
··· 236 236 237 237 static int qca_regulator_enable(struct qca_serdev *qcadev); 238 238 static void qca_regulator_disable(struct qca_serdev *qcadev); 239 - static void qca_power_shutdown(struct hci_uart *hu); 240 - static int qca_power_off(struct hci_dev *hdev); 239 + static void qca_power_off(struct hci_uart *hu); 241 240 static void qca_controller_memdump(struct work_struct *work); 242 241 static void qca_dmp_hdr(struct hci_dev *hdev, struct sk_buff *skb); 243 242 ··· 2046 2047 2047 2048 out: 2048 2049 if (ret) { 2049 - qca_power_shutdown(hu); 2050 + qca_power_off(hu); 2050 2051 2051 2052 if (retries < MAX_INIT_RETRIES) { 2052 2053 bt_dev_warn(hdev, "Retry BT power ON:%d", retries); ··· 2210 2211 QCA_CAP_HFP_HW_OFFLOAD, 2211 2212 }; 2212 2213 2213 - static void qca_power_shutdown(struct hci_uart *hu) 2214 + static void qca_power_off(struct hci_uart *hu) 2214 2215 { 2215 2216 struct qca_serdev *qcadev; 2216 2217 struct qca_data *qca = hu->priv; ··· 2271 2272 set_bit(QCA_BT_OFF, &qca->flags); 2272 2273 } 2273 2274 2274 - static int qca_power_off(struct hci_dev *hdev) 2275 + static int qca_hci_shutdown(struct hci_dev *hdev) 2275 2276 { 2276 2277 struct hci_uart *hu = hci_get_drvdata(hdev); 2277 2278 struct qca_data *qca = hu->priv; ··· 2290 2291 usleep_range(8000, 10000); 2291 2292 } 2292 2293 2293 - qca_power_shutdown(hu); 2294 + qca_power_off(hu); 2294 2295 return 0; 2295 2296 } 2296 2297 ··· 2529 2530 2530 2531 if (power_ctrl_enabled) { 2531 2532 hci_set_quirk(hdev, HCI_QUIRK_NON_PERSISTENT_SETUP); 2532 - hdev->shutdown = qca_power_off; 2533 + hdev->shutdown = qca_hci_shutdown; 2533 2534 } 2534 2535 2535 2536 if (data) { ··· 2564 2565 case QCA_WCN6855: 2565 2566 case QCA_WCN7850: 2566 2567 if (power->vregs_on) 2567 - qca_power_shutdown(&qcadev->serdev_hu); 2568 + qca_power_off(&qcadev->serdev_hu); 2568 2569 break; 2569 2570 default: 2570 2571 break;