Skip to content

Commit

Permalink
Bluetooth: Use single return in hci_uart_tty_ioctl() call
Browse files Browse the repository at this point in the history
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: Vignesh Raman <Vignesh_Raman@mentor.com>
Signed-off-by: Dean Jenkins <Dean_Jenkins@mentor.com>
Signed-off-by: Rajeev Kumar <rajeev_kumar@mentor.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Vignesh Raman authored and Marcel Holtmann committed Sep 24, 2016
1 parent 37332dd commit 0565069
Showing 1 changed file with 15 additions and 13 deletions.
28 changes: 15 additions & 13 deletions drivers/bluetooth/hci_ldisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = hci_uart_set_flags(hu, arg);
if (err)
return err;
err = -EBUSY;
else
err = hci_uart_set_flags(hu, arg);
break;

case HCIUARTGETFLAGS:
return hu->hdev_flags;
err = hu->hdev_flags;
break;

default:
err = n_tty_ioctl_helper(tty, file, cmd, arg);
Expand Down

0 comments on commit 0565069

Please sign in to comment.