Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01178cd4 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Rename hci_request to hci_req_sync 



We'll be introducing an async version of hci_request. To make things
clear it makes sense to rename the existing API to have a _sync suffix.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 24fd642c

net/bluetooth/hci_core.c

+25 −24
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static void hci_req_cancel(struct hci_dev *hdev, int err) 
}



/* Execute request and wait for completion. */

static int __hci_request(struct hci_dev *hdev,

static int __hci_req_sync(struct hci_dev *hdev,

			  void (*req)(struct hci_dev *hdev, unsigned long opt),

			  unsigned long opt, __u32 timeout)

{
@@ -150,7 +150,7 @@ static int __hci_request(struct hci_dev *hdev, 
	return err;

}



static int hci_request(struct hci_dev *hdev,

static int hci_req_sync(struct hci_dev *hdev,

			void (*req)(struct hci_dev *hdev, unsigned long opt),

			unsigned long opt, __u32 timeout)

{
@@ -161,7 +161,7 @@ static int hci_request(struct hci_dev *hdev, 


	/* Serialize all requests */

	hci_req_lock(hdev);

	ret = __hci_request(hdev, req, opt, timeout);

	ret = __hci_req_sync(hdev, req, opt, timeout);

	hci_req_unlock(hdev);



	return ret;
@@ -556,7 +556,8 @@ int hci_inquiry(void __user *arg) 
	timeo = ir.length * msecs_to_jiffies(2000);



	if (do_inquiry) {

		err = hci_request(hdev, hci_inq_req, (unsigned long)&ir, timeo);

		err = hci_req_sync(hdev, hci_inq_req, (unsigned long) &ir,

				   timeo);

		if (err < 0)

			goto done;

	}
@@ -737,7 +738,7 @@ int hci_dev_open(__u16 dev) 
		set_bit(HCI_INIT, &hdev->flags);

		hdev->init_last_cmd = 0;



		ret = __hci_request(hdev, hci_init_req, 0, HCI_INIT_TIMEOUT);

		ret = __hci_req_sync(hdev, hci_init_req, 0, HCI_INIT_TIMEOUT);



		clear_bit(HCI_INIT, &hdev->flags);

	}
@@ -828,7 +829,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	if (!test_bit(HCI_RAW, &hdev->flags) &&

	    test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) {

		set_bit(HCI_INIT, &hdev->flags);

		__hci_request(hdev, hci_reset_req, 0, HCI_CMD_TIMEOUT);

		__hci_req_sync(hdev, hci_reset_req, 0, HCI_CMD_TIMEOUT);

		clear_bit(HCI_INIT, &hdev->flags);

	}
@@ -921,7 +922,7 @@ int hci_dev_reset(__u16 dev) 
	hdev->acl_cnt = 0; hdev->sco_cnt = 0; hdev->le_cnt = 0;



	if (!test_bit(HCI_RAW, &hdev->flags))

		ret = __hci_request(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT);

		ret = __hci_req_sync(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT);



done:

	hci_req_unlock(hdev);
@@ -960,7 +961,7 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg) 


	switch (cmd) {

	case HCISETAUTH:

		err = hci_request(hdev, hci_auth_req, dr.dev_opt,

		err = hci_req_sync(hdev, hci_auth_req, dr.dev_opt,

				   HCI_INIT_TIMEOUT);

		break;
@@ -972,23 +973,23 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg) 


		if (!test_bit(HCI_AUTH, &hdev->flags)) {

			/* Auth must be enabled first */

			err = hci_request(hdev, hci_auth_req, dr.dev_opt,

			err = hci_req_sync(hdev, hci_auth_req, dr.dev_opt,

					   HCI_INIT_TIMEOUT);

			if (err)

				break;

		}



		err = hci_request(hdev, hci_encrypt_req, dr.dev_opt,

		err = hci_req_sync(hdev, hci_encrypt_req, dr.dev_opt,

				   HCI_INIT_TIMEOUT);

		break;



	case HCISETSCAN:

		err = hci_request(hdev, hci_scan_req, dr.dev_opt,

		err = hci_req_sync(hdev, hci_scan_req, dr.dev_opt,

				   HCI_INIT_TIMEOUT);

		break;



	case HCISETLINKPOL:

		err = hci_request(hdev, hci_linkpol_req, dr.dev_opt,

		err = hci_req_sync(hdev, hci_linkpol_req, dr.dev_opt,

				   HCI_INIT_TIMEOUT);

		break;
@@ -1608,10 +1609,10 @@ static int hci_do_le_scan(struct hci_dev *hdev, u8 type, u16 interval, 


	hci_req_lock(hdev);



	err = __hci_request(hdev, le_scan_param_req, (unsigned long) &param,

	err = __hci_req_sync(hdev, le_scan_param_req, (unsigned long) &param,

			     timeo);

	if (!err)

		err = __hci_request(hdev, le_scan_enable_req, 0, timeo);

		err = __hci_req_sync(hdev, le_scan_enable_req, 0, timeo);



	hci_req_unlock(hdev);