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

Commit e0d9727e authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Refactor stop_discovery 



This patch does a trivial code refactoring in stop_discovery
function by using a switch statement instead of an if-return-else
approach.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo@padovan.org>
parent 7537e5c3

net/bluetooth/mgmt.c

+24 −16
Original line number Diff line number Diff line
@@ -2401,31 +2401,39 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data, 
		goto unlock;

	}



	if (hdev->discovery.state == DISCOVERY_FINDING) {

	switch (hdev->discovery.state) {

	case DISCOVERY_FINDING:

		if (test_bit(HCI_INQUIRY, &hdev->flags))

			err = hci_cancel_inquiry(hdev);

		else

			err = hci_cancel_le_scan(hdev);



		if (err < 0)

			mgmt_pending_remove(cmd);

		else

			hci_discovery_set_state(hdev, DISCOVERY_STOPPING);

		goto unlock;

	}

		break;



	e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_PENDING);

	case DISCOVERY_RESOLVING:

		e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY,

							NAME_PENDING);

		if (!e) {

			mgmt_pending_remove(cmd);

		err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY, 0,

				   &mgmt_cp->type, sizeof(mgmt_cp->type));

			err = cmd_complete(sk, hdev->id,

					   MGMT_OP_STOP_DISCOVERY, 0,

					   &mgmt_cp->type,

					   sizeof(mgmt_cp->type));

			hci_discovery_set_state(hdev, DISCOVERY_STOPPED);

			goto unlock;

		}



		bacpy(&cp.bdaddr, &e->data.bdaddr);

	err = hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ_CANCEL, sizeof(cp),

			   &cp);

		err = hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ_CANCEL,

				   sizeof(cp), &cp);



		break;



	default:

		BT_DBG("unknown discovery state %u", hdev->discovery.state);

		err = -EFAULT;

	}



	if (err < 0)

		mgmt_pending_remove(cmd);

	else