GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-05 22:28:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bluetooth: Use single return in hci_uart_tty_ioctl() call

Browse source 
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>
This commit is contained in:
Vignesh Raman 2016-09-23 18:56:28 +01:00 • committed by Marcel Holtmann
parent 37332ddc14
commit 056506944a
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/bluetooth/hci_ldisc.c
View file

@ -697,34 +697,36 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file *file,
case HCIUARTSETPROTO: case HCIUARTSETPROTO:
if (!test_and_set_bit(HCI_UART_PROTO_SET, &hu->flags)) { if (!test_and_set_bit(HCI_UART_PROTO_SET, &hu->flags)) {
err = hci_uart_set_proto(hu, arg); err = hci_uart_set_proto(hu, arg);
if (err) { if (err)
clear_bit(HCI_UART_PROTO_SET, &hu->flags); clear_bit(HCI_UART_PROTO_SET, &hu->flags);
return err;
}
} else } else
return -EBUSY; err = -EBUSY;
break; break;
case HCIUARTGETPROTO: case HCIUARTGETPROTO:
if (test_bit(HCI_UART_PROTO_SET, &hu->flags)) if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
return hu->proto->id; err = hu->proto->id;
return -EUNATCH; else
err = -EUNATCH;
break;
case HCIUARTGETDEVICE: case HCIUARTGETDEVICE:
if (test_bit(HCI_UART_REGISTERED, &hu->flags)) if (test_bit(HCI_UART_REGISTERED, &hu->flags))
return hu->hdev->id; err = hu->hdev->id;
return -EUNATCH; else
err = -EUNATCH;
break;
case HCIUARTSETFLAGS: case HCIUARTSETFLAGS:
if (test_bit(HCI_UART_PROTO_SET, &hu->flags)) if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
return -EBUSY; err = -EBUSY;
err = hci_uart_set_flags(hu, arg); else
if (err) err = hci_uart_set_flags(hu, arg);
return err;
break; break;
case HCIUARTGETFLAGS: case HCIUARTGETFLAGS:
return hu->hdev_flags; err = hu->hdev_flags;
break;
default: default:
err = n_tty_ioctl_helper(tty, file, cmd, arg); err = n_tty_ioctl_helper(tty, file, cmd, arg);