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

Commit 05650694 authored by Vignesh Raman's avatar Vignesh Raman Committed by Marcel Holtmann
Browse files

Bluetooth: Use single return in hci_uart_tty_ioctl() call 



Remove multiple return statements in hci_uart_tty_ioctl() call and
added a single return statement.

This code re-organisation allows subsequent locking to be easily
added.

Signed-off-by: default avatarVignesh Raman <Vignesh_Raman@mentor.com>
Signed-off-by: default avatarDean Jenkins <Dean_Jenkins@mentor.com>
Signed-off-by: default avatarRajeev Kumar <rajeev_kumar@mentor.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 37332ddc

drivers/bluetooth/hci_ldisc.c

+15 −13
Original line number Diff line number Diff line
@@ -697,34 +697,36 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file *file, 
	case HCIUARTSETPROTO:

		if (!test_and_set_bit(HCI_UART_PROTO_SET, &hu->flags)) {

			err = hci_uart_set_proto(hu, arg);

			if (err) {

			if (err)

				clear_bit(HCI_UART_PROTO_SET, &hu->flags);

				return err;

			}

		} else

			return -EBUSY;

			err = -EBUSY;

		break;



	case HCIUARTGETPROTO:

		if (test_bit(HCI_UART_PROTO_SET, &hu->flags))

			return hu->proto->id;

		return -EUNATCH;

			err = hu->proto->id;

		else

			err = -EUNATCH;

		break;



	case HCIUARTGETDEVICE:

		if (test_bit(HCI_UART_REGISTERED, &hu->flags))

			return hu->hdev->id;

		return -EUNATCH;

			err = hu->hdev->id;

		else

			err = -EUNATCH;

		break;



	case HCIUARTSETFLAGS:

		if (test_bit(HCI_UART_PROTO_SET, &hu->flags))

			return -EBUSY;

			err = -EBUSY;

		else

			err = hci_uart_set_flags(hu, arg);

		if (err)

			return err;

		break;



	case HCIUARTGETFLAGS:

		return hu->hdev_flags;

		err = hu->hdev_flags;

		break;



	default:

		err = n_tty_ioctl_helper(tty, file, cmd, arg);